From 9db5db549f3acd2db31fa1b2d92110139091fb1f Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 16 Jun 2017 10:23:00 +0800
Subject: [PATCH] feat(invitation): show invitations expired status in detail
 page

---
 modules/core/client/app/trans-string-en.js       |  3 ++-
 modules/core/client/app/trans-string-zh.js       |  3 ++-
 .../controllers/invitations.client.controller.js | 16 ++++++++++++++++
 .../client/views/detail.client.view.html         |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 750b6b56..2e8e93d6 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -456,7 +456,8 @@
       TITLE_SEND: 'Send an invitation',
       TITLE_STATUS: 'Status',
       TITLE_STATUS_REGED: 'Signed',
-      TITLE_STATUS_UNREGED: 'Unsigned'
+      TITLE_STATUS_UNREGED: 'Unsigned',
+      TITLE_STATUS_EXPIRED: 'Expired'
     },
     GET_INVITATIONS_ERROR: 'Get invitations failed',
     BUTTON_INVITE: 'Send',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 9fc4266d..8e45b8ba 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -456,7 +456,8 @@
       TITLE_SEND: '发送邀请',
       TITLE_STATUS: '状态',
       TITLE_STATUS_REGED: '已注册',
-      TITLE_STATUS_UNREGED: '未注册'
+      TITLE_STATUS_UNREGED: '未注册',
+      TITLE_STATUS_EXPIRED: '已失效'
     },
     GET_INVITATIONS_ERROR: '获取邀请列表失败',
     BUTTON_INVITE: '发送',
diff --git a/modules/invitations/client/controllers/invitations.client.controller.js b/modules/invitations/client/controllers/invitations.client.controller.js
index e49c5394..8c4724e1 100644
--- a/modules/invitations/client/controllers/invitations.client.controller.js
+++ b/modules/invitations/client/controllers/invitations.client.controller.js
@@ -83,5 +83,21 @@
         });
       }
     };
+
+    /**
+     * getInvitationStatus
+     * @param invitation
+     */
+    vm.getInvitationStatus = function (invitation) {
+      if(invitation.status == 2) {
+        return $translate.instant('INVITATION.TITLE_STATUS_REGED');
+      }else {
+        if(invitation.expiresat>Date.now()){
+          return $translate.instant('INVITATION.TITLE_STATUS_UNREGED');
+        }else{
+          return $translate.instant('INVITATION.TITLE_STATUS_EXPIRED');
+        }
+      }
+    };
   }
 }());
diff --git a/modules/invitations/client/views/detail.client.view.html b/modules/invitations/client/views/detail.client.view.html
index bf8a4627..35aec640 100644
--- a/modules/invitations/client/views/detail.client.view.html
+++ b/modules/invitations/client/views/detail.client.view.html
@@ -102,7 +102,7 @@
                                     <td class="text-center" ng-if="!r.to_user">
                                     </td>
                                     <td class="text-center" ng-class="r.status == 2 ? 'text-success' : 'text-danger'">
-                                        {{ r.status == 2 ? ('INVITATION.TITLE_STATUS_REGED' | translate) : ('INVITATION.TITLE_STATUS_UNREGED' | translate) }}
+                                        {{vm.getInvitationStatus(r);}}
                                     </td>
                                 </tr>
                             </tbody>