Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-28 Thread Trimardio
Ohh! I do that now! and yes it fixed the bug :) Thanks. I remove this branch then! -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduling into

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-28 Thread SirVer
Can you propose that other branch for merging once you are ready? Only then can we know if the diff is correct or if bzr is still confused. -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to review the proposed merge

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-25 Thread Trimardio
Ok, I created a new branch and pushed it. Is it clean enough now? lp:~trimardio/widelands-website/scheduling_module I have other bugs to fix though. Don't start the alpha yet. -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-20 Thread kaputtnik
I had to do this also in the past and created a new branch. The particular revisions related to this branch will be lost in the new branch though. This discussion will ever be available, afaik. It's just not linked with the new branch. --

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-20 Thread Trimardio
>What about calling it "target_date" or "avail_time"? avail_time seems clearer to me. I'll use that! Ok, for the django database and the missing file! >The diff is pretty messed up (for example local_settings.py.sample is reported >to be removed and added). Could you refork from trunk and make

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-20 Thread SirVer
The diff is pretty messed up (for example local_settings.py.sample is reported to be removed and added). Could you refork from trunk and make a new branch with a clean history? -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-20 Thread kaputtnik
Seems the file base.html is missing. -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/scheduling into lp:widelands-website.

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-20 Thread kaputtnik
> We are talking about one particular hour, not one particular date. >From my understanding the model saves a date and an hour for each chosen hour. >So it is not an particular hour. Finding good names for variables and field names is sometimes difficult. What about calling it "target_date" or

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-19 Thread Trimardio
I changed the database schema but the command: './manage.py makemigrations wlscheduling' resulted in "No changes detected in app 'wlscheduling'" Is that normal? -- https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-19 Thread Trimardio
Agreed on every point. I really liked your suggestion for the main page, I didn't like the result. Now it's far better! >Is there a reason why the model field is called 'hour' but it is a DateTime >field? Something like: >if datetime.now() > a.hour: a.delete() We are talking about one

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-19 Thread kaputtnik
An idea for the Main page: Describe what a user can do here as plain text above the 'buttons' and limit the text of the 'buttons' to something like: "Define your playtime" and "Show other users playtime" Additional information could then be made in a title attribute. Just a suggestion :-) I

Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-19 Thread kaputtnik
First look: create a base template and load the needed css and js files in there. This should be done in a block tag: {% block extra_head %} ... load css and js {% endblock %} And in the other templates use then {% extends "wlscheduling/base.html" %} So loading those files are done in place

[Widelands-dev] [Merge] lp:~trimardio/widelands-website/scheduling into lp:widelands-website

2017-09-19 Thread Trimardio
Trimardio has proposed merging lp:~trimardio/widelands-website/scheduling into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~trimardio/widelands-website/scheduling/+merge/330997 Added the scheduling module.