Merge remote-tracking branch 'origin/staging' into origin/production

public/hospital-portal/lang/en-US.json

@@ -13,7 +13,10 @@
   "txtDialogMember2" : "Request LOG",
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Please select services",
-  "txtDialogMember5" : "Submission Date",
+  "txtDialogMember5" : "Admission Date",
+  "txtDialogMember6" : "Please select admission date",  
+  "txtWarningDischargeDate" : "Please select discharge date",
+  "txtCreateAt" : "Create at",
   "txtDateBirth" : "Date of Birth",
   "txtGender" : "Gender",
   "txtMaritalStatus" : "Marital Status",
@@ -27,7 +30,7 @@
   "txtStatus" : "Status",
   "txtSearch" : "Search Name or Member ID...",
   "txtAll" : "All",
-  "txtSubmissionDate" : "Submission Date",
+  "txtSubmissionDate" : "Admission Date",
   "txtDataNotFound" : "Data Not Found",
   "txtConditionDocument" : "Condition Document",
   "txtDiagnosisDokument" : "Diagnosis Dokument",
@@ -45,5 +48,16 @@
   "txtYouHave" : "You have",
   "txtUnm" : "unread messages",
   "txtNew" : "New",
-  "txtBeforeThat" : "Before that"
+  "txtBeforeThat" : "Before that",
+  "txtDischargeDate" : "Discharge Date",
+  "txtPatner" : "Patner",
+  "txtSelected": "Selected",
+  "txtConfirmation": "Confirmation",
+  "txtReason": "Reason Decline",
+  "txtCancel": "Cancel",
+  "txtDecline": "Decline",
+  "txtApprove": "Approve",
+  "txtDialogConfirmation": "Are you sure you want to proceed with this action?",
+  "txtStartDate": "Start Date",
+  "txtEndDate": "End Date"
 }