Early arrival period (Midburn#911)

* fixing the adding none existan member bug. * Showing only on the correct dates.
eladlachmi · May 19, 2018 · 0c26000 · 0c26000
1 parent 1672662
commit 0c26000
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/public/scripts/controllers/camp_edit.js b/public/scripts/controllers/camp_edit.js
@@ -265,6 +265,15 @@ app.controller("campEditController", ($scope, $http, $filter, $q) => {
         return allocationPeriod.start < now && now < allocationPeriod.end;
     };
 
+    $scope.earlyArrivalPeriodIsActive = () => {
+        const now = new Date();
+        const earlyArrivalPeriod = {
+            start : new Date(controllDates.early_arrivals_start),
+            end : new Date(controllDates.early_arrivals_end),
+        };
+        return earlyArrivalPeriod.start < now && now < earlyArrivalPeriod.end;
+    };
+
     $scope.updateEarlyArrival = (user_name, user_id, action_type) => {
         var camp_id = $scope.current_camp_id;
         var user_rec = {

diff --git a/views/pages/camps/partials/members_table.jade b/views/pages/camps/partials/members_table.jade
@@ -69,11 +69,11 @@ table.table.table-striped.table-hover
                     button.btn.btn-xs
                         span(class='glyphicon glyphicon-remove' )
                         =t('camps:members.group_sale_ticket_remove')
-                a.cursor-p(ng-show='1' ng-click='updateEarlyArrival(member.name, member.user_id, "early_arrival")' ng-if="!member.early_arrival") &nbsp;
+                a.cursor-p(ng-show='earlyArrivalPeriodIsActive()' ng-click='updateEarlyArrival(member.name, member.user_id, "early_arrival")' ng-if="!member.early_arrival") &nbsp;
                     button.btn.btn-xs
                         span(class='glyphicon glyphicon-ok' )
                         =t('camps:members.set_early_arrival')
-                a.cursor-p(ng-show='1' ng-click='updateEarlyArrival(member.name, member.user_id, "early_arrival")' ng-if="member.early_arrival")
+                a.cursor-p(ng-show='earlyArrivalPeriodIsActive()' ng-click='updateEarlyArrival(member.name, member.user_id, "early_arrival")' ng-if="member.early_arrival")
                     button.btn.btn-xs
                         span(class='glyphicon glyphicon-remove' )
                         =t('camps:members.remove_early_arrival')