diff --git a/.gitignore b/.gitignore index 77fef510..32f4e3e3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,10 +5,7 @@ config*yaml *.log # Compiled front-end -montage/static/index.html -montage/static/assets -montage/static/dist - +montage/static/ # emacs *~ diff --git a/client/app/components/campaign/campaign-admin.tpl.html b/client/app/components/campaign/campaign-admin.tpl.html index ae00fcfd..feb2d846 100644 --- a/client/app/components/campaign/campaign-admin.tpl.html +++ b/client/app/components/campaign/campaign-admin.tpl.html @@ -20,7 +20,8 @@ cancel - {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} – {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} + {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} {{$ctrl.campaign.open_date | date: 'HH:mm'}} UTC – + {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} {{$ctrl.campaign.close_date | date: 'HH:mm'}} UTC element.name), - open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'), - close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC') + open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'), + close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss') }); userService.admin.editCampaign(campaign_.id, campaign_).then((response) => { @@ -370,8 +370,12 @@ const CampaignComponent = { loading.window = true; round.new_jurors = round.jurors.map((user) => user.name); + const round_ = angular.extend({}, round, { + deadline_date: $filter('date')(round.deadline_date, 'yyyy-MM-ddTHH:mm:ss') + }) + $q.all({ - round: userService.admin.editRound(round.id, round) + round: userService.admin.editRound(round_.id, round_) }).then((response) => { if (response.round.error) { loading.window = false; diff --git a/client/app/components/campaign/edit-campaign.tpl.html b/client/app/components/campaign/edit-campaign.tpl.html index a3d532e6..d55d1e42 100644 --- a/client/app/components/campaign/edit-campaign.tpl.html +++ b/client/app/components/campaign/edit-campaign.tpl.html @@ -24,7 +24,7 @@

Edit campaign

ng-model="campaign.open_date"> -

Open Date and Time

+

Open Date and Time (UTC)

@@ -39,7 +39,7 @@

Edit campaign

ng-model="campaign.close_date"> -

Close Date and Time

+

Close Date and Time (UTC)

 diff --git a/client/app/components/campaign/edit-round.tpl.html b/client/app/components/campaign/edit-round.tpl.html index 79afb0b7..ddc10d46 100644 --- a/client/app/components/campaign/edit-round.tpl.html +++ b/client/app/components/campaign/edit-round.tpl.html @@ -26,10 +26,15 @@

{{voteMethods[round.vote_method].label}}

date_range
- -

Deadline Date

+
+ + + + +
+

Close Date and Time (UTC)

 diff --git a/client/app/components/dashboard/dashboard.js b/client/app/components/dashboard/dashboard.js index 69bd1f71..43455e28 100644 --- a/client/app/components/dashboard/dashboard.js +++ b/client/app/components/dashboard/dashboard.js @@ -39,16 +39,16 @@ const DashboardComponent = { campaign: { name: '', coordinators: [], - open_date: new Date(Date.UTC(2016, 8, 1)), - close_date: new Date(Date.UTC(2016, 8, 30)) + open_date: new Date(Date.UTC(2017, 8, 1)), + close_date: new Date(Date.UTC(2017, 8, 30)) }, today: new Date(), create: (campaign_, loading) => { let campaign = angular.copy(campaign_); campaign = angular.extend(campaign, { coordinators: campaign.coordinators.map((element) => element.name), - open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'), - close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC') + open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'), + close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss') }); loading.window = true; diff --git a/client/app/components/dashboard/new-campaign.tpl.html b/client/app/components/dashboard/new-campaign.tpl.html index dc1b30b2..34cc0ae7 100644 --- a/client/app/components/dashboard/new-campaign.tpl.html +++ b/client/app/components/dashboard/new-campaign.tpl.html @@ -24,22 +24,8 @@

Add new campaign

ng-model="campaign.open_date"> -

Open Date and Time

+

Open Date and Time (UTC)

- - info - - Once the images are imported to round 1,
- changing the campaign's date and time won't
- make a difference in the images your jury
- will be able to view. However, changing
- these values before the import to round 1
- will make sure that only photos that
- are uploaded (for the first time) after
- the start date and time specified here
- are viewed by your jury. - - date_range @@ -53,20 +39,17 @@

Add new campaign

ng-model="campaign.close_date"> -

Close Date and Time

+

Close Date and Time (UTC)

+ + + + info +
+

Once the images are imported to round 1, changing date and time won't make a difference in the images your jury + will be able to view. However, changing these values before the import to round 1 will make + sure that only photos that are uploaded (for the first time) before the end date and time + are viewed by your jury.

- - info - - Once the images are imported to round 1,
- changing date and time won't make a difference
- in the images your jury will be able to view.
- However, changing these values before the import
- to round 1 will make sure that only photos that
- are uploaded (for the first time) before the end
- date and time are viewed by your jury. - - Campaign coordinators diff --git a/client/app/components/main/main.tpl.html b/client/app/components/main/main.tpl.html index 3f04bb39..ed2ee215 100644 --- a/client/app/components/main/main.tpl.html +++ b/client/app/components/main/main.tpl.html @@ -48,7 +48,7 @@