Jelajahi Sumber

Care months, cm/rm entries [WIP]

Vijayakrishnan Krishnan 5 tahun lalu
induk
melakukan
4066b21a51

+ 10 - 0
app/Helpers/helpers.php

@@ -28,3 +28,13 @@ if(!function_exists('friendly_date_time')) {
     }
 }
 
+if(!function_exists('time_in_minsec')) {
+    function time_in_minsec($value) {
+        if(!$value || empty($value)) return "-";
+        $value = intval($value);
+        $minutes = intval($value / 60);
+        $seconds = $value % 60;
+        return "{$minutes}m, {$seconds}s";
+    }
+}
+

+ 87 - 20
resources/views/app/patient/care-month/dashboard.blade.php

@@ -14,15 +14,39 @@
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="py-0 mb-3">Add CM Entry</a>
-                <form url="/api/careMonth/create">
-                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                <form url="/api/careMonthEntry/createForCm">
+                    <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
                     <div class="mb-2">
-                        <input type="number" min="1" max="12" class="form-control form-control-sm" name="startMonth"
-                               value="" placeholder="Start Month">
+                        <input type="text" class="form-control form-control-sm" name="proUid"
+                               value="" placeholder="Pro">
                     </div>
                     <div class="mb-2">
-                        <input type="number" min="2020" max="2100" class="form-control form-control-sm" name="startYear"
-                               value="" placeholder="Start Year">
+                        <input type="date" class="form-control form-control-sm" name="effectiveDate"
+                               value="" placeholder="Effective Date">
+                    </div>
+                    <div class="mb-2">
+                        <input type="number" min="0" max="9999" class="form-control form-control-sm" name="timeInSeconds"
+                               value="" placeholder="Time in Seconds">
+                    </div>
+                    <div class="mb-2 d-flex align-items-center">
+                        <span>Time Specific:</span>
+                        <input type="checkbox" name="isTimeSpecific" class="ml-1">
+                    </div>
+                    <div class="mb-2">
+                        <input type="time" class="form-control form-control-sm" name="startingTime"
+                               value="" placeholder="Starting Time">
+                    </div>
+                    <div class="mb-2">
+                        <input type="time" class="form-control form-control-sm" name="endingTime"
+                               value="" placeholder="Ending Time">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="contentText"
+                               value="" placeholder="Content Text">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="contentDetail"
+                               value="" placeholder="Content Detail">
                     </div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -33,15 +57,39 @@
             <span class="mx-2 text-secondary">|</span>
             <div moe>
                 <a start show class="py-0 mb-3">Add RM Entry</a>
-                <form url="/api/careMonth/create">
-                    <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
+                <form url="/api/careMonthEntry/createForRm">
+                    <input type="hidden" name="careMonthUid" value="{{ $careMonth->uid }}">
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="proUid"
+                               value="" placeholder="Pro">
+                    </div>
                     <div class="mb-2">
-                        <input type="number" min="1" max="12" class="form-control form-control-sm" name="startMonth"
-                               value="" placeholder="Start Month">
+                        <input type="date" class="form-control form-control-sm" name="effectiveDate"
+                               value="" placeholder="Effective Date">
                     </div>
                     <div class="mb-2">
-                        <input type="number" min="2020" max="2100" class="form-control form-control-sm" name="startYear"
-                               value="" placeholder="Start Year">
+                        <input type="number" min="0" max="9999" class="form-control form-control-sm" name="timeInSeconds"
+                               value="" placeholder="Time in Seconds">
+                    </div>
+                    <div class="mb-2 d-flex align-items-center">
+                        <span>Time Specific:</span>
+                        <input type="checkbox" name="isTimeSpecific" class="ml-1">
+                    </div>
+                    <div class="mb-2">
+                        <input type="time" class="form-control form-control-sm" name="startingTime"
+                               value="" placeholder="Starting Time">
+                    </div>
+                    <div class="mb-2">
+                        <input type="time" class="form-control form-control-sm" name="endingTime"
+                               value="" placeholder="Ending Time">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="contentText"
+                               value="" placeholder="Content Text">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="contentDetail"
+                               value="" placeholder="Content Detail">
                     </div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -65,7 +113,7 @@
                     <tr>
                         <th class="px-2 text-secondary border-bottom-0">Created</th>
                         <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-                        <th class="px-2 text-secondary border-bottom-0">Total Time (s)</th>
+                        <th class="px-2 text-secondary border-bottom-0">Time (mins)</th>
                         <th class="px-2 text-secondary border-bottom-0">Details</th>
                         <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
                     </tr>
@@ -76,11 +124,20 @@
                         <tr>
                             <td class="px-2">{{friendly_date_time($entry->created_at)}}</td>
                             <td class="px-2">{{friendly_date_time($entry->effective_date)}}</td>
-                            <td class="px-2">{{$entry->achieved_total_time_in_seconds}}</td>
-                            <td class="px-2">-</td>
+                            <td class="px-2">
+                                <div>CM Pro: {{time_in_minsec($entry->achieved_cm_pro_time_in_seconds)}}</div>
+                                <div>MCP: {{time_in_minsec($entry->achieved_mcp_time_in_seconds)}}</div>
+                                <div>Total: {{time_in_minsec($entry->achieved_total_time_in_seconds)}}</div>
+                            </td>
+                            <td class="px-2">
+                                <em>
+                                    <div>content_text</div>
+                                    <div>content_detail</div>
+                                </em>
+                            </td>
                             <td class="px-2 text-center delete-column">
                                 <div moe relative>
-                                    <a start show><i class="fa fa-trash text-danger"></i></a>
+                                    <a start show><i class="on-hover-opaque fa fa-trash text-danger"></i></a>
                                     <form url="/api/careMonthEntry/remove" right>
                                         <input type="hidden" name="uid" value="{{ $entry->uid }}">
                                         <p class="small">Are you sure you want to delete this CM entry?</p>
@@ -104,7 +161,7 @@
                     <tr>
                         <th class="px-2 text-secondary border-bottom-0">Created</th>
                         <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-                        <th class="px-2 text-secondary border-bottom-0">Total Time (s)</th>
+                        <th class="px-2 text-secondary border-bottom-0">Time (mins)</th>
                         <th class="px-2 text-secondary border-bottom-0">Details</th>
                         <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
                     </tr>
@@ -115,11 +172,21 @@
                             <tr>
                                 <td class="px-2">{{friendly_date_time($entry->created_at)}}</td>
                                 <td class="px-2">{{friendly_date_time($entry->effective_date)}}</td>
-                                <td class="px-2">{{$entry->achieved_total_time_in_seconds}}</td>
-                                <td class="px-2">-</td>
+                                <td class="px-2">
+                                    <div>RME Pro: {{time_in_minsec($entry->achieved_rme_pro_time_in_seconds)}}</div>
+                                    <div>RMM Pro: {{time_in_minsec($entry->achieved_rmm_pro_time_in_seconds)}}</div>
+                                    <div>MCP: {{time_in_minsec($entry->achieved_mcp_time_in_seconds)}}</div>
+                                    <div>Total: {{time_in_minsec($entry->achieved_total_time_in_seconds)}}</div>
+                                </td>
+                                <td class="px-2">
+                                    <em>
+                                        <div>content_text</div>
+                                        <div>content_detail</div>
+                                    </em>
+                                </td>
                                 <td class="px-2 text-center delete-column">
                                     <div moe relative>
-                                        <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <a start show><i class="on-hover-opaque fa fa-trash text-danger"></i></a>
                                         <form url="/api/careMonthEntry/remove" right>
                                             <input type="hidden" name="uid" value="{{ $entry->uid }}">
                                             <p class="small">Are you sure you want to delete this RM entry?</p>