update to new notes

app/Http/Controllers/NoteController.php

@@ -83,6 +83,7 @@ class NoteController extends Controller
         $sectionTemplate = null;
 
         if($section == null){
+            // TODO require valid note_uid & section_template_uid
             $note = Note::where('uid', $note_uid)->first();
             $sectionTemplate = SectionTemplate::where('uid', $section_template_uid)->first();
         } else {
@@ -90,6 +91,8 @@ class NoteController extends Controller
             $sectionTemplate = SectionTemplate::where('id', $section->section_template_id)->first();
         }
 
+        // our intention is to now process a submit...
+        // ... the point of which is to have newContentData and newSummaryHtml
         $newContentData = [];
         $newSummaryHtml = "";
 
@@ -97,6 +100,7 @@ class NoteController extends Controller
         // if CREATE, $note and $sectionTemplate, and $request
         // if UPDATE, $section, and $request
 
+        // remember: the existence of form.php overrides section_template.is_canvas == TRUE
         if(file_exists(storage_path('sections/' . $sectionTemplate->internal_name . '/form.blade.php'))) {
           
             include(storage_path('sections/' . $sectionTemplate->internal_name . '/processor.php'));
@@ -113,6 +117,7 @@ class NoteController extends Controller
             }  
         }
 
+        $response = null;
         if($section){
             // call Java to update section
             $data = [
@@ -135,7 +140,10 @@ class NoteController extends Controller
             //TODO: handle if response->success == false
         }
         //return redirect(route('patients.view.notes',$note->client->uid));
-         return $newSummaryHtml;
+         return [
+             'success' => $response->success,
+             'newSummaryHtml' => $newSummaryHtml
+         ];
     }
 
     private function callJava($request, $endPoint, $data){

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

@@ -217,7 +217,7 @@
                         $shortcuts = "";
                         $latestSectionTS = 0;
                         ?>
-                        @include('app.patient.note.note-list')
+                        @include('app.patient.note.note-section-list')
                     </div>
                 </div>
 

resources/views/app/patient/note/note-list.blade.php → resources/views/app/patient/note/note-section-list.blade.php

@@ -1,6 +1,7 @@
 @foreach($note->sections as $section)
     <?php
     $sectionTS = strtotime($section->created_at);
+    // TODO ask Vijay why is this here?
     if($latestSectionTS === 0 || $latestSectionTS < $sectionTS) {
         $latestSectionTS = $sectionTS;
     }
@@ -52,7 +53,9 @@
             </a>
 
         </div>
-        <div class="d-none if-not-edit  inset-comment">{!! !empty($section->summary_html) ? $section->summary_html : '-' !!}</div>
+        <div class="d-none if-not-edit  inset-comment">
+            {!! !empty($section->summary_html) ? $section->summary_html : '-' !!}
+        </div>
 
         <div class="d-none if-edit">
             
@@ -63,9 +66,7 @@
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => $sectionInternalName])
                     </div>
-                    <div class="bg-light border p-2 mb-3">
-                        @include("app.patient.canvas-sections.${sectionInternalName}.summary")
-                    </div>
+                   
                 </div>
             <?php
                 } else if(file_exists(storage_path('sections/' . $sectionInternalName . '/form.blade.php'))) {
@@ -84,7 +85,6 @@
                         'value'=>''
                     ];
                 }
-                $formID = rand(0, 100000);
             ?>
             <form ajax-form method="POST" action="/process_form_submit">
                 <input type="hidden" name="section_uid" value="<?= $section->uid?>">
@@ -137,6 +137,7 @@
                 showMask();
                 $(this).ajaxForm(function(result){
                     console.log("DONE: "+result);
+                    //TODO: Swap new summary html
                     fastReload();
                 });
             })
@@ -145,5 +146,7 @@
                 $(el).closest('.note-section').toggleClass('edit');
                 return false;
             }
+
         })
+        
     </script>