Skip to content

Commit a35c1bd

Browse files
yarlyarl
authored
Merge pull request #12 from hatnote/dev
version 17.06.01
2 parents f28dbb7 + 332ba67 commit a35c1bd

File tree

9 files changed

+40
-49
lines changed

9 files changed

+40
-49
lines changed

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ config*yaml
55
*.log
66

77
# Compiled front-end
8-
montage/static/index.html
9-
montage/static/assets
10-
montage/static/dist
11-
8+
montage/static/
129

1310
# emacs
1411
*~

‎client/app/components/campaign/campaign-admin.tpl.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<md-icon>cancel</md-icon>
2121
</md-button>
2222
<small class="md-headline muted">
23-
{{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} – {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}}
23+
{{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} <small>{{$ctrl.campaign.open_date | date: 'HH:mm'}} UTC</small> –
24+
{{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} <small>{{$ctrl.campaign.close_date | date: 'HH:mm'}} UTC</small>
2425
</small>
2526
<span flex></span>
2627
<md-button class="md-icon-button" aria-label="Edit"

‎client/app/components/campaign/campaign.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ const CampaignComponent = {
349349

350350
let campaign_ = angular.extend(angular.copy(campaign), {
351351
coordinators: campaign.coordinators.map((element) => element.name),
352-
open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'),
353-
close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC')
352+
open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'),
353+
close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss')
354354
});
355355

356356
userService.admin.editCampaign(campaign_.id, campaign_).then((response) => {
@@ -370,8 +370,12 @@ const CampaignComponent = {
370370
loading.window = true;
371371
round.new_jurors = round.jurors.map((user) => user.name);
372372

373+
const round_ = angular.extend({}, round, {
374+
deadline_date: $filter('date')(round.deadline_date, 'yyyy-MM-ddTHH:mm:ss')
375+
})
376+
373377
$q.all({
374-
round: userService.admin.editRound(round.id, round)
378+
round: userService.admin.editRound(round_.id, round_)
375379
}).then((response) => {
376380
if (response.round.error) {
377381
loading.window = false;

‎client/app/components/campaign/edit-campaign.tpl.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 class="md-title no-margin">Edit campaign</h2>
2424
ng-model="campaign.open_date">
2525
</md-input-container>
2626
</div>
27-
<p>Open Date and Time</p>
27+
<p>Open Date and Time (UTC)</p>
2828
</div>
2929
</md-list-item>
3030
<md-list-item class="md-2-line">
@@ -39,7 +39,7 @@ <h2 class="md-title no-margin">Edit campaign</h2>
3939
ng-model="campaign.close_date">
4040
</md-input-container>
4141
</div>
42-
<p>Close Date and Time</p>
42+
<p>Close Date and Time (UTC)</p>
4343
</div>
4444
</md-list-item>
4545
</md-list>

‎client/app/components/campaign/edit-round.tpl.html‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ <h3>{{voteMethods[round.vote_method].label}}</h3>
2626
<md-list-item class="md-2-line">
2727
<md-icon>date_range</md-icon>
2828
<div class="md-list-item-text">
29-
<md-datepicker ng-model="round.deadline_date"
30-
md-min-date="today"
31-
md-hide-icons="calendar"></md-datepicker>
32-
<p>Deadline Date</p>
29+
<div layout="row" layout-align="space-between start">
30+
<md-datepicker ng-model="round.deadline_date"
31+
md-hide-icons="calendar"></md-datepicker>
32+
<md-input-container class="dialog__input--flat" flex>
33+
<input name="hour" type="time"
34+
ng-model="round.deadline_date">
35+
</md-input-container>
36+
</div>
37+
<p>Close Date and Time (UTC)</p>
3338
</div>
3439
</md-list-item>
3540
</md-list>

‎client/app/components/dashboard/dashboard.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ const DashboardComponent = {
3939
campaign: {
4040
name: '',
4141
coordinators: [],
42-
open_date: new Date(Date.UTC(2016, 8, 1)),
43-
close_date: new Date(Date.UTC(2016, 8, 30))
42+
open_date: new Date(Date.UTC(2017, 8, 1)),
43+
close_date: new Date(Date.UTC(2017, 8, 30))
4444
},
4545
today: new Date(),
4646
create: (campaign_, loading) => {
4747
let campaign = angular.copy(campaign_);
4848
campaign = angular.extend(campaign, {
4949
coordinators: campaign.coordinators.map((element) => element.name),
50-
open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC'),
51-
close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss', 'UTC')
50+
open_date: $filter('date')(campaign.open_date, 'yyyy-MM-ddTHH:mm:ss'),
51+
close_date: $filter('date')(campaign.close_date, 'yyyy-MM-ddTHH:mm:ss')
5252
});
5353

5454
loading.window = true;

‎client/app/components/dashboard/new-campaign.tpl.html‎

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,8 @@ <h2 class="md-title no-margin">Add new campaign</h2>
2424
ng-model="campaign.open_date">
2525
</md-input-container>
2626
</div>
27-
<p>Open Date and Time</p>
27+
<p>Open Date and Time (UTC)</p>
2828
</div>
29-
<md-icon class="margin__left link">
30-
info
31-
<md-tooltip>
32-
Once the images are imported to round 1,<br />
33-
changing the campaign's date and time won't<br />
34-
make a difference in the images your jury<br />
35-
will be able to view. However, changing<br />
36-
these values before the import to round 1<br />
37-
will make sure that only photos that<br />
38-
are uploaded (for the first time) after<br />
39-
the start date and time specified here<br />
40-
are viewed by your jury.
41-
</md-tooltip>
42-
</md-icon>
4329
</md-list-item>
4430
<md-list-item class="md-2-line">
4531
<md-icon>date_range</md-icon>
@@ -53,20 +39,17 @@ <h2 class="md-title no-margin">Add new campaign</h2>
5339
ng-model="campaign.close_date">
5440
</md-input-container>
5541
</div>
56-
<p>Close Date and Time</p>
42+
<p>Close Date and Time (UTC)</p>
43+
</div>
44+
</md-list-item>
45+
<md-list-item class="md-2-line">
46+
<md-icon>info</md-icon>
47+
<div class="md-list-item-text">
48+
<p class="muted">Once the images are imported to round 1, changing date and time won't make a difference in the images your jury
49+
will be able to view. However, changing these values before the import to round 1 will make
50+
sure that only photos that are uploaded (for the first time) before the end date and time
51+
are viewed by your jury.</p>
5752
</div>
58-
<md-icon class="margin__left link">
59-
info
60-
<md-tooltip>
61-
Once the images are imported to round 1,<br />
62-
changing date and time won't make a difference<br />
63-
in the images your jury will be able to view.<br />
64-
However, changing these values before the import<br />
65-
to round 1 will make sure that only photos that<br />
66-
are uploaded (for the first time) before the end<br />
67-
date and time are viewed by your jury.
68-
</md-tooltip>
69-
</md-icon>
7053
</md-list-item>
7154
</md-list>
7255
<strong class="md-subhead">Campaign coordinators</strong>

‎client/app/components/main/main.tpl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h2 class="link" ng-click="$ctrl.goToDashboard()">
4848
<div class="container" layout="column" layout-align="space-between stretch" flex>
4949
<ui-view></ui-view>
5050
<footer layout="row" layout-align="space-between center">
51-
<span>&copy; 2016
51+
<span>&copy; 2017
5252
<a href="https://github.com/hatnote">Hatnote</a> &bull;
5353
<a href="https://github.com/hatnote/montage/blob/master/README.md">About</a>
5454
</span>

‎client/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "montage",
3-
"version": "16.11.03",
3+
"version": "17.06.01",
44
"description": "Photo evaluation tool for and by Wiki Loves competitions",
55
"main": "app/index.js",
66
"repository": "https://github.com/hatnote/montage",
@@ -9,7 +9,8 @@
99
"start": "webpack --watch --content-base app --progress --colors",
1010
"build": "webpack --content-base app --progress",
1111
"build-zip": "webpack --content-base app --progress && cd ../montage/static && zip -r app.zip .",
12-
"build-all-win": "set NODE_ENV=dev&&webpack --content-base app --progress&&set NODE_ENV=beta&&webpack --content-base app --progress"
12+
"build-dev": "set NODE_ENV=dev&&webpack --content-base app --progress",
13+
"build-beta": "set NODE_ENV=beta&&webpack --content-base app --progress"
1314
},
1415
"license": "BSD-3-Clause",
1516
"devDependencies": {

0 commit comments

Comments
 (0)