صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
tigerphp
/
stagfe2
4
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

Note UI updates

Vijayakrishnan 3 سال پیش
والد
dff119d54d
کامیت
4f56bd86c0
9فایلهای تغییر یافته به همراه15 افزوده شده و 47 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 7 4
      js-dev/mc.js
  2. 1 1
      resources/views/app/mc.blade.php
  3. 1 8
      resources/views/app/patient/allergies-center.blade.php
  4. 1 8
      resources/views/app/patient/careteam-center.blade.php
  5. 1 8
      resources/views/app/patient/goals-center.blade.php
  6. 1 8
      resources/views/app/patient/medications-center.blade.php
  7. 1 1
      resources/views/app/patient/medications-reconcile.blade.php
  8. 1 8
      resources/views/app/patient/problems-center.blade.php
  9. 1 1
      resources/views/app/patient/supplements-center.blade.php

+ 7 - 4
js-dev/mc.js
مشاهده فایل 

@@ -707,10 +707,13 @@ window.initSegmentMoes = function(_parent) {
 
         .off('click.visit-moe-show')
 
         .on('click.visit-moe-show', function () {
 
             $('[visit-moe] [url]:not([show])').hide();
 
-            $(this)
 
-                .closest('[visit-moe]')
 
-                .find('form[url]')
 
-                .show();
 
+            let form = $(this).closest('[visit-moe]').find('form[url]');
 
+            form.show();
 
+            if(!form.is('[no-auto-focus]')) {
 
+                setTimeout(() => {
 
+                    form.find('.ql-editor').first().focus();
 
+                }, 0);
 
+            }
 
             return false;
 
         });

+ 1 - 1
resources/views/app/mc.blade.php
مشاهده فایل 

@@ -1,6 +1,6 @@
 
 {{-- lean wrapper for 2 pane page --}}
 
 <!doctype html>
 
-<html lang="en" class="h-100">
 
+<html lang="en" class="h-100 overflow-hidden">
 
 <head>
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">

+ 1 - 8
resources/views/app/patient/allergies-center.blade.php
مشاهده فایل 

@@ -102,7 +102,7 @@ if(!@$summaryView) {
 
                                 <div>
 
                                     <div moe huge relative>
 
                                         <a start show href="#" title="Edit"><?= !!@($allergy->data->name) ? @($allergy->data->name) : '-' ?></a>
 
-                                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-allergy">
 
+                                        <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-allergy">
 
                                             <input type="hidden" name="uid" value="<?= $allergy->uid ?>">
 
                                             <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                             <p class="mb-2"><b>Update Allergy</b></p>
 
@@ -429,13 +429,6 @@ if(!@$summaryView) {
 
 
             buttonContainer.insertAfter(titleElem);
 
 
-            <?php
 
-            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
 
-                ?>
 
-                button.trigger('click');
 
-                <?php
 
-            }
 
-            ?>
 
         }
 
         addMCInitializer('allergies-center-{{$note->id}}', init, '#allergies-center-{{$note->id}}');
 
     }).call(window);

+ 1 - 8
resources/views/app/patient/careteam-center.blade.php
مشاهده فایل 

@@ -63,7 +63,7 @@ if(!@$careTeamMembers || !@$counts) {
 
                                             <?= !!@($careTeamMember->data->specialty) ? ' / ' . @($careTeamMember->data->specialty) : '' ?>
 
                                             <?= !!@($careTeamMember->data->organization) ? ' / ' . @($careTeamMember->data->organization) : '' ?>
 
                                         </a>
 
-                                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-care-team-member">
 
+                                        <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-care-team-member">
 
                                             <input type="hidden" name="uid" value="<?= $careTeamMember->uid ?>">
 
                                             <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                             <p class="mb-2"><b>Update Care Team Member</b></p>
 
@@ -421,13 +421,6 @@ if(!@$careTeamMembers || !@$counts) {
 
 
             buttonContainer.insertAfter(titleElem);
 
 
-            <?php
 
-            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
 
-                ?>
 
-                button.trigger('click');
 
-                <?php
 
-            }
 
-            ?>
 
         }
 
         addMCInitializer('careteam-center-{{$note->id}}', init, '#careteam-center-{{$note->id}}');
 
     }).call(window);

+ 1 - 8
resources/views/app/patient/goals-center.blade.php
مشاهده فایل 

@@ -57,7 +57,7 @@ if(!@$goals || !@$counts) {
 
                             @if(!@$summaryView)
 
                             <div moe huge relative>
 
                                 <a start show href="#" title="Edit"><?= !!@($goal->data->goal) ? @($goal->data->goal) : '-' ?></a>
 
-                                <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-goal">
 
+                                <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-goal">
 
                                     <input type="hidden" name="uid" value="<?= $goal->uid ?>">
 
                                     <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                     <p class="mb-2"><b>Update Goal</b></p>
 
@@ -313,13 +313,6 @@ if(!@$goals || !@$counts) {
 
 
             buttonContainer.insertAfter(titleElem);
 
 
-            <?php
 
-            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
 
-                ?>
 
-                button.trigger('click');
 
-                <?php
 
-            }
 
-            ?>
 
         }
 
         addMCInitializer('goals-center-{{$note->id}}', init, '#goals-center-{{$note->id}}');
 
     }).call(window);

+ 1 - 8
resources/views/app/patient/medications-center.blade.php
مشاهده فایل 

@@ -89,7 +89,7 @@ if(!@$summaryView) {
 
                                 @if(!@$summaryView)
 
                                     <div moe huge relative>
 
                                         <a start show href="#" title="Edit"><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></a>
 
-                                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-medication">
 
+                                        <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-medication">
 
                                             <input type="hidden" name="uid" value="<?= $medication->uid ?>">
 
                                             <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                             <p class="mb-2"><b>Update Medication</b></p>
 
@@ -473,13 +473,6 @@ if(!@$summaryView) {
 
 
         setTimeout(() => {
 
         __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));
 
-        <?php
 
-        if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
 
-            ?>
 
-            // button.trigger('click');
 
-            <?php
 
-        }
 
-        ?>
 
         }, 0);
 
     }
 
     addMCInitializer('medications-center-{{$note->id}}', init, '#medications-center-{{$note->id}}');

+ 1 - 1
resources/views/app/patient/medications-reconcile.blade.php
مشاهده فایل 

@@ -76,7 +76,7 @@ $medications = $points;
 
                             @endif
 
                             <div moe class="ml-2">
 
                                 <a href="#" start show>Mark {{$medication->is_removed ? 'Active' : 'Historic'}}</a>
 
-                                <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1">
 
+                                <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1">
 
                                     <p class="mb-2">Mark medication as {{$medication->is_removed ? 'Active' : 'Historic'}}</p>
 
                                     <input type="hidden" name="uid" value="{{$medication->uid}}">
 
                                     <input type="hidden" name="noteUid" value="{{$note->uid}}">

+ 1 - 8
resources/views/app/patient/problems-center.blade.php
مشاهده فایل 

@@ -139,7 +139,7 @@ if(!@$summaryView) {
 
                                         <?= !!@($problem->data->name) ? @($problem->data->name) : '-' ?>
 
                                         <?= !!@($problem->data->icd) ? '/&nbsp;' . @($problem->data->icd) : '' ?>
 
                                     </a>
 
-                                    <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-problem">
 
+                                    <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-problem">
 
                                         <input type="hidden" name="uid" value="<?= $problem->uid ?>">
 
                                         <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                         <p class="mb-2"><b>Update Problem</b></p>
 
@@ -542,13 +542,6 @@ if(!@$summaryView) {
 
                     '</div>').appendTo(buttonContainer);
 
             }, 1000);
 
 
-            <?php
 
-            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
 
-                ?>
 
-                button.trigger('click');
 
-                <?php
 
-            }
 
-            ?>
 
         }
 
         addMCInitializer('problems-center-{{$note->id}}', init, '#problems-center-{{$note->id}}');
 
     }).call(window);

+ 1 - 1
resources/views/app/patient/supplements-center.blade.php
مشاهده فایل 

@@ -56,7 +56,7 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
 
                     <td>
 
                         <div moe huge relative>
 
                             <a start show href="#" title="Edit">Edit</a>
 
-                            <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-supplement">
 
+                            <form url="/api/visitPoint/updateTopLevel" no-auto-focus class="mcp-theme-1 frm-edit-supplement">
 
                                 <input type="hidden" name="uid" value="<?= $supplement->uid ?>">
 
                                 <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
 
                                 <p class="mb-2"><b>Update Supplement</b></p>