This fixes issue # 88.

slashroots · Aug 11, 2015 · c4348c5 · matjames007 · Aug 11, 2015 · c4348c5
1 parent 901a77c
commit c4348c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/public/javascripts/controllers/farmer-ctrl.js b/public/javascripts/controllers/farmer-ctrl.js
@@ -90,6 +90,14 @@ angular.module('jasmic.controllers')
                 }
             };
 
+            $scope.isActive = function(exp_date) {
+                if(new Date(exp_date) > Date.now()) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+
             /**
              * Attempts to add new Farm to the farmer object.  Assumes the
              * server will take care of the address creation.

diff --git a/public/partials/membership_card.html b/public/partials/membership_card.html
@@ -18,7 +18,7 @@ <h3 class="white">Membership</h3>
         <div flex layout="row">
             <md-icon class="no-margin" md-svg-icon="/images/icons/icons_farmer_active.svg"></md-icon>
             <div layout-align="center" style="text-align: center;" layout="column" ng-class="{'md-offset': 1}">
-                Active
+                {{isActive(memberships[0].mi_expiration.split("T")[0])?  "Active" :  'Inactive'}}
                 <div class="label">Status</div>
             </div>
         </div>