Merge pull request #12 from hatnote/dev

version 17.06.01
hatnote · Jun 4, 2017 · a35c1bd · a35c1bd
2 parents f28dbb7 + 332ba67
commit a35c1bd
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 49 deletions.
diff --git 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
@@ -20,7 +20,8 @@
             <md-icon>cancel</md-icon>
         </md-button>
         <small class="md-headline muted">
-            {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} – {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}}
+            {{$ctrl.campaign.open_date | date: 'd MMM yyyy'}} <small>{{$ctrl.campaign.open_date | date: 'HH:mm'}} UTC</small> – 
+            {{$ctrl.campaign.close_date | date: 'd MMM yyyy'}} <small>{{$ctrl.campaign.close_date | date: 'HH:mm'}} UTC</small>
         </small>
         <span flex></span>
         <md-button class="md-icon-button" aria-label="Edit"

diff --git a/client/app/components/campaign/campaign.js b/client/app/components/campaign/campaign.js
@@ -349,8 +349,8 @@ const CampaignComponent = {
 
             let campaign_ = angular.extend(angular.copy(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')
             });
 
             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
@@ -24,7 +24,7 @@ <h2 class="md-title no-margin">Edit campaign</h2>
                                         ng-model="campaign.open_date">
                                 </md-input-container>
                             </div>
-                            <p>Open Date and Time</p>
+                            <p>Open Date and Time (UTC)</p>
                         </div>
                     </md-list-item>
                     <md-list-item class="md-2-line">
@@ -39,7 +39,7 @@ <h2 class="md-title no-margin">Edit campaign</h2>
                                         ng-model="campaign.close_date">
                                 </md-input-container>
                             </div>
-                            <p>Close Date and Time</p>
+                            <p>Close Date and Time (UTC)</p>
                         </div>
                     </md-list-item>
                 </md-list>

diff --git a/client/app/components/campaign/edit-round.tpl.html b/client/app/components/campaign/edit-round.tpl.html
@@ -26,10 +26,15 @@ <h3>{{voteMethods[round.vote_method].label}}</h3>
                     <md-list-item class="md-2-line">
                         <md-icon>date_range</md-icon>
                         <div class="md-list-item-text">
-                            <md-datepicker ng-model="round.deadline_date"
-                                           md-min-date="today"
-                                           md-hide-icons="calendar"></md-datepicker>
-                            <p>Deadline Date</p>
+                            <div layout="row" layout-align="space-between start">
+                                <md-datepicker ng-model="round.deadline_date"
+                                            md-hide-icons="calendar"></md-datepicker>
+                                <md-input-container class="dialog__input--flat" flex>
+                                    <input name="hour" type="time"
+                                        ng-model="round.deadline_date">
+                                </md-input-container>
+                            </div>
+                            <p>Close Date and Time (UTC)</p>
                         </div>
                     </md-list-item>
                 </md-list>

diff --git 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
@@ -24,22 +24,8 @@ <h2 class="md-title no-margin">Add new campaign</h2>
                                         ng-model="campaign.open_date">
                                 </md-input-container>
                             </div>
-                            <p>Open Date and Time</p>
+                            <p>Open Date and Time (UTC)</p>
                         </div>
-                        <md-icon class="margin__left link">
-                            info
-                            <md-tooltip>
-                                Once the images are imported to round 1,<br />
-                                changing the campaign's date and time won't<br />
-                                make a difference in the images your jury<br />
-                                will be able to view. However, changing<br />
-                                these values before the import to round 1<br />
-                                will make sure that only photos that<br />
-                                are uploaded (for the first time) after<br />
-                                the start date and time specified here<br />
-                                are viewed by your jury.
-                            </md-tooltip>
-                        </md-icon>
                     </md-list-item>
                     <md-list-item class="md-2-line">
                         <md-icon>date_range</md-icon>
@@ -53,20 +39,17 @@ <h2 class="md-title no-margin">Add new campaign</h2>
                                         ng-model="campaign.close_date">
                                 </md-input-container>
                             </div>
-                            <p>Close Date and Time</p>
+                            <p>Close Date and Time (UTC)</p>
+                        </div>
+                    </md-list-item>
+                    <md-list-item class="md-2-line">
+                        <md-icon>info</md-icon>
+                        <div class="md-list-item-text">
+                            <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
+                            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.</p>
                         </div>
-                        <md-icon class="margin__left link">
-                            info
-                            <md-tooltip>
-                                Once the images are imported to round 1,<br />
-                                changing date and time won't make a difference<br />
-                                in the images your jury will be able to view.<br />
-                                However, changing these values before the import<br />
-                                to round 1 will make sure that only photos that<br />
-                                are uploaded (for the first time) before the end<br />
-                                date and time are viewed by your jury.
-                            </md-tooltip>
-                        </md-icon>
                     </md-list-item>
                 </md-list>
                 <strong class="md-subhead">Campaign coordinators</strong>

diff --git a/client/app/components/main/main.tpl.html b/client/app/components/main/main.tpl.html
@@ -48,7 +48,7 @@ <h2 class="link" ng-click="$ctrl.goToDashboard()">
 <div class="container" layout="column" layout-align="space-between stretch" flex>
     <ui-view></ui-view>
     <footer layout="row" layout-align="space-between center">
-        <span>&copy; 2016
+        <span>&copy; 2017
             <a href="https://github.com/hatnote">Hatnote</a> &bull;
             <a href="https://github.com/hatnote/montage/blob/master/README.md">About</a>
         </span>

diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "montage",
-  "version": "16.11.03",
+  "version": "17.06.01",
   "description": "Photo evaluation tool for and by Wiki Loves competitions",
   "main": "app/index.js",
   "repository": "https://github.com/hatnote/montage",
@@ -9,7 +9,8 @@
     "start": "webpack --watch --content-base app --progress --colors",
     "build": "webpack --content-base app --progress",
     "build-zip": "webpack --content-base app --progress && cd ../montage/static && zip -r app.zip .",
-    "build-all-win": "set NODE_ENV=dev&&webpack --content-base app --progress&&set NODE_ENV=beta&&webpack --content-base app --progress"
+    "build-dev": "set NODE_ENV=dev&&webpack --content-base app --progress",
+    "build-beta": "set NODE_ENV=beta&&webpack --content-base app --progress"
   },
   "license": "BSD-3-Clause",
   "devDependencies": {