In-segment autosave indicator

resources/views/app/patient/note/dashboard.blade.php

@@ -2409,13 +2409,6 @@
                                 <span>Handouts</span>
                             </div>
                         </div>
-                        <div class="ml-auto mr-5 nbt-container border-info d-inline-flex align-self-stretch align-items-center">
-                            <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
-                            <span class="autosave-indicator saved text-sm text-secondary">
-                                <i class="fa fa-check"></i>
-                                Saved
-                            </span>
-                        </div>
                     </div>
                     @endif
 

resources/views/app/patient/note/segment_script.blade.php

@@ -307,14 +307,14 @@
             };
 
             let debouncedSaver = debounce(function(_trigger) {
-                $('.autosave-indicator').removeClass('show');
-                $('.autosave-indicator.saving').addClass('show');
+                $(_trigger).closest('.visit-segment').find('.autosave-indicator').removeClass('show');
+                $(_trigger).closest('.visit-segment').find('.autosave-indicator.saving').addClass('show');
                 saveVisitForm(_trigger, true, false, () => {
                     $('.autosave-indicator').removeClass('show');
                     $('.autosave-indicator.saved').addClass('show');
-                    window.setTimeout(() => {
+                    /*window.setTimeout(() => {
                         $('.autosave-indicator').removeClass('show');
-                    }, 1000);
+                    }, 1000);*/
                 });
             }, 500);
 

resources/views/app/patient/segment-templates/_simple_text_segment/edit.php

@@ -18,8 +18,14 @@ if (!!@$point->data) {
              data-field-name="free_text"
         ><?= $parsed && @$parsed->free_text ? $parsed->free_text : '' ?></div>
         <div>
-            <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+            <div class="d-inline-flex align-self-stretch align-items-center">
+                <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                <span class="autosave-indicator saved text-sm text-secondary">
+                    <i class="fa fa-check"></i>
+                    Saved
+                </span>
+            </div>
         </div>
     </form>
 </div>

resources/views/app/patient/segment-templates/chief_complaint/edit.blade.php

@@ -51,8 +51,14 @@ if(!$parsed || !@$parsed->free_text) {
              data-field-name="free_text"
         ><?= $parsed && @$parsed->free_text ? $parsed->free_text : '' ?></div>
         <div>
-            <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+            <div class="d-inline-flex align-self-stretch align-items-center">
+                <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                <span class="autosave-indicator saved text-sm text-secondary">
+                    <i class="fa fa-check"></i>
+                    Saved
+                </span>
+            </div>
         </div>
     </form>
 </div>

resources/views/app/patient/segment-templates/history_family/edit.blade.php

@@ -278,10 +278,23 @@ if(!$contentData) {
 
             </div>
 
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
-            </div>
+            @if(!!$segment)
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <div class="d-inline-flex align-self-stretch align-items-center">
+                        <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                        <span class="autosave-indicator saved text-sm text-secondary">
+                            <i class="fa fa-check"></i>
+                            Saved
+                        </span>
+                    </div>
+                </div>
+            @else
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                </div>
+            @endif
 
         </form>
     </div>

resources/views/app/patient/segment-templates/history_screenings/edit.blade.php

@@ -65,10 +65,23 @@ if(!$contentData) {
 
             </div>
 
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-            </div>
+            @if(!!$segment)
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <div class="d-inline-flex align-self-stretch align-items-center">
+                        <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                        <span class="autosave-indicator saved text-sm text-secondary">
+                            <i class="fa fa-check"></i>
+                            Saved
+                        </span>
+                    </div>
+                </div>
+            @else
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                </div>
+            @endif
 
         </form>
     </div>

resources/views/app/patient/segment-templates/history_social/edit.blade.php

@@ -123,10 +123,23 @@ for ($i = 0; $i < count($fields); $i++) {
                 </div>
             </div>
 
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
-            </div>
+            @if(!!$segment)
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <div class="d-inline-flex align-self-stretch align-items-center">
+                        <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                        <span class="autosave-indicator saved text-sm text-secondary">
+                            <i class="fa fa-check"></i>
+                            Saved
+                        </span>
+                    </div>
+                </div>
+            @else
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                </div>
+            @endif
 
         </form>
     </div>

resources/views/app/patient/segment-templates/history_surgical/edit.blade.php

@@ -123,10 +123,23 @@ for ($i = 0; $i < count($fields); $i++) {
                 </div>
             </div>
 
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : 'cancel' !!}>Close</button>
-            </div>
+            @if(!!$segment)
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <div class="d-inline-flex align-self-stretch align-items-center">
+                        <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                        <span class="autosave-indicator saved text-sm text-secondary">
+                            <i class="fa fa-check"></i>
+                            Saved
+                        </span>
+                    </div>
+                </div>
+            @else
+                <div>
+                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                </div>
+            @endif
 
         </form>
     </div>

resources/views/app/patient/segment-templates/vitals/edit.blade.php

@@ -193,8 +193,14 @@ $copyTriggerAdded = [];
             </tbody>
         </table>
         <div>
-            <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+            <div class="d-inline-flex align-self-stretch align-items-center">
+                <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
+                <span class="autosave-indicator saved text-sm text-secondary">
+                    <i class="fa fa-check"></i>
+                    Saved
+                </span>
+            </div>
         </div>
     </form>
 </div>