-
Notifications
You must be signed in to change notification settings - Fork 147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New receive screen (ready) #222
Conversation
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less
…sed orders to put it in nicely
From my point of view, this is (in principle) the way how the user interface should be designed: For each task in the real world, there should be a specific clear form. However, the workflow in our foodcoop seems to be a bit different from yours. At that day when the products arrive, a small team of people (2-4) is responsible for distributing the products to the boxes of the ordergroups and the rest to the stockit. If there are deviations from the ordered amounts, the updated values are currently entered in the balancing form in order to also change the billing for the ordergroups. In the new form suggested here there is no possibility to change the distribution to the ordergroups, so how is this meant to be done? Anyway, some more comments:
|
Thanks for your extensive reply! What you describe is similar to what we do, only we do not track our stock using foodsoft. What the receive screen does is not only storing the number of received units, but also re-running the distribution algorithm (same as when the order is closed) to update the ordergroup amounts. This is also what the checkboxes at the bottom do: they control where the rest of the articles go after members got their quantities. One option is tolerance (which is what happens when the order is closed), the other is stock (which is not implemented yet, that's why it is disabled for now). It probably makes a lot of sense to add a notice that ordergroup amounts are being changed as well, especially when they have been manually updated (if we can detect that).
Does this make sense? |
Thanks for the explanations. I think I have a better idea of your intention now. I will now try to focus on the fundamental topics here instead of commenting on minor issues.
Yeah, that is in principle a useful feature. Since we as foodcoop members need to check the delivered products anyway, it is a nice idea to combine this step with an update of the order in the foodsoft (instead of drawing ticks and crosses on a sheet of paper). However, in order to be production ready for us I see the need of possibly tricky improvements:
Do you feel motivated to implement these things in a team before going for a merge or do you prefer to introduce the feature more quickly? In the latter case it would be important for us that the old-fashioned pen-and-paper method would still work as usual.
You are right that stock orders should not have a receive screen. However, I was referring to a different phenomenon. The exclamation mark in the balancing screen now shows up if, e.g., |
Thanks Julius, also for seeing an overall picture of this.
|
actually the price of the current article, which will probably be different in the future
Ok, that's it, I think. Do you think it's ready? If so, let's:
|
p.s. Any reason why you put the table footer above the body? Since it can be quite a long list of new articles to add, I'd like to load the table body first. |
I do not know when I will have time to look at it carefully. Maybe at the weekend. Feel free to merge master already.
Yes, seems like I am old. Did not know that is is allowed after the See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tfoot
|
Ah, didn't realise that - thanks for looking it up! |
Conflicts: app/helpers/finance/order_articles_helper.rb
Synchronize German and English locales
Conflicts: config/locales/de.yml
until heartcombo/simple_form#974 has a solution (reverts parts of ce17bf3 and 9db8cb7)
Nice. From my point of view we can
Since you might have a reason for not having done so yet, I will leave it up to you. After some days I will also have a second look on all changes here. |
Great! I've spotted some small bugs (see description), when these are fixed I consider it ready. |
@@ -1114,12 +1129,14 @@ de: | |||
title: Artikel | |||
index: | |||
action_end: Beenden | |||
action_receive: In Empfang nehmen |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It occured to me that this might be a bit long for the green button. Would "empfang(en)" be an option?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It occured to me that this might be a bit long for the green button.
Do you care about aesthetics or the usability on small screens? The other options I can think of are definitively worse although they might be acceptable. I would vote for a change if there is a problem but just for symmetry I would not worsen the "understandability".
However, there might be a term which I just can not think of. Suggestions are welcome.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The size of the button attracts my attention. And yes, I was thinking of smaller screens too. But I wouldn't want to sacrifice clarity! I'll see if some German person here has any ideas :) Not really important, but just checking.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see your point about the eye-catching thing. I will keep this in mind if I find a nice short replacement.
Since it's been a week, I'll start merging this. To be safe, I've pushed the pre-receive version of foodsoft to a foodsoft-archive branch. |
Sorry, I have not found time yet to review all the stuff. For me it is fine - go on. |
Ok! Thanks for the note. |
When the received amounts differ from those ordered, redistribution of changed quantities over members is manual. This pull request adds a "receive" screen in the orders section, where amounts received can be entered, after which products are redistributed over members using the existing algorithm.
Includes the addition of a
units_received
field inOrderArticle
. An additionalunits_billed
field is created as well although it has no user-interface yet (but this is very much similar to this screen).Where
OrderArticle#units_to_order
was used, you'll probably want to useOrderArticle#units
, which takes the last entered amount (ordered, billed, received - in that order). Where the amount of units of closed orders is shown, there now is a title attribute showing the history (e.g: "2 ordered, 1 billed, 1 received").A new convention is introduced: whenever a number is the amount of wholesale units (full boxes, unit_quantities, lot, whatever), a watermark image of a box is shown next to it. I hope this brings clarity to whether numbers are member units or wholesale units.
See also foodcoop-adam#2 and foodcoop-adam#3.
workaround Label pluralization heartcombo/simple_form#974 orrevert pluralisation of activerecord attributesFormer tasks which where reorganized or deleted:
Vertical align of cells-> Center table rows vertically #247Redistribute when unlock was pressed, even if amount was unchanged (?)After this, next steps would be