merge master

canopas · Sep 12, 2023 · 1230594 · 1230594
1 parent 7947df3
commit 1230594
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/api-doc.md b/api-doc.md
@@ -309,10 +309,11 @@
     - Headers : none
     - Body :
         {
-            "name": "mansi dhameliya",
-            "date": "3 jan 2023",  // OR if you want to add multiple dates, you can add like this : "3 jan 2023 to 5 jan 2023"
-            "status": 1,  // you can use 1 for request
-            "reason": "Casual Leave",
+            "name":     "mansi dhameliya",
+            "date":     "3 jan 2023",  // OR if you want to add multiple dates, you can add like this : "3 jan 2023 to 5 jan 2023"
+            "duration": "first-half" // You can add first-half or second-half or 3 days as you want
+            "status":   1,  // you can use 1 for request
+            "reason":   "Casual Leave",
             "receiver": "[email protected]",
         }
 - Response :

diff --git a/leave/leave.go b/leave/leave.go
@@ -21,6 +21,7 @@ const (
 type LeaveData struct {
 	Name        string `json:"name" form:"name"`
 	Date        string `json:"date" form:"date"`
+	Duration    string `json:"duration" form:"duration"`
 	Status      int    `json:"status" form:"status"`
 	Reason      string `json:"reason" form:"reason"`
 	Receiver    string `json:"receiver" form:"receiver"`

diff --git a/leave/templates/new-leave-email-template.html b/leave/templates/new-leave-email-template.html
@@ -11,11 +11,11 @@
     <tbody>
       <tr class="review-application-div">
         <p>
-          There's a new leave request from {{.Name}}. Please check Unity for
+          There's a new leave request for the <b>{{.Duration}}</b> from {{.Name}}. Please check Unity for
           more information.
         </p>
         <p>
-          <span><b>Date : </b></span><span class="title-span"> {{.Date}}</span
+          <span><b>Date : </b></span><span class="title-span"> {{.Date}} ( {{.Duration}} ) </span
           ><br />
           <span><b>Status:</b></span>
           <span class="title-span"> {{.StatusValue}}</span><br />

diff --git a/templates/new-leave-email-template.html b/templates/new-leave-email-template.html
@@ -11,11 +11,11 @@
     <tbody>
       <tr class="review-application-div">
         <p>
-          There's a new leave request from {{.Name}}. Please check Unity for
+          There's a new leave request for the <b>{{.Duration}}</b> from {{.Name}}. Please check Unity for
           more information.
         </p>
         <p>
-          <span><b>Date : </b></span><span class="title-span"> {{.Date}}</span
+          <span><b>Date : </b></span><span class="title-span"> {{.Date}} ( {{.Duration}} ) </span
           ><br />
           <span><b>Status:</b></span>
           <span class="title-span"> {{.StatusValue}}</span><br />