Explorar el Código

Process claims - full-calendar inside stag-popup fix

Vijayakrishnan hace 3 años
padre
commit
da7f57487e

+ 10 - 10
public/css/style.css

@@ -583,8 +583,8 @@ input.search_field, textarea.search_field {
     font-weight: bold !important;
     color: #000 !important;
 }
-#caremonth-measurements-calendar table.table-condensed td[has-events],
-#caremonth-measurements-calendar td.has-events a {
+.caremonth-measurements-calendar table.table-condensed td[has-events],
+.caremonth-measurements-calendar td.has-events a {
     background: #c5e4ff !important;
     font-weight: bold !important;
     color: #000 !important;
@@ -1671,23 +1671,23 @@ th.only-screen, td.only-screen {
     min-width: 1450px;
 }
 
-#caremonth-measurements-calendar .fc-event.m-weight {
+.caremonth-measurements-calendar .fc-event.m-weight {
     background: #38908f;
     color: #fff;
     padding-left: 5px;
     margin-bottom: 2px;
 }
-#caremonth-measurements-calendar .fc-event.m-bp {
+.caremonth-measurements-calendar .fc-event.m-bp {
     background: #5e96ae;
     color: #fff;
     padding-left: 5px;
     margin-bottom: 2px;
 }
-#caremonth-measurements-calendar .fc-event.m-weight *,
-#caremonth-measurements-calendar .fc-event.m-bp *{
+.caremonth-measurements-calendar .fc-event.m-weight *,
+.caremonth-measurements-calendar .fc-event.m-bp *{
     font-size: 10px !important;
 }
-#caremonth-measurements-calendar .fc-daygrid-event-dot {
+.caremonth-measurements-calendar .fc-daygrid-event-dot {
     display: none;
 }
 
@@ -1695,11 +1695,11 @@ th.only-screen, td.only-screen {
     width: 100%;
     border: 0 !important;
 }
-#caremonth-measurements-calendar>.ui-datepicker-inline {
+.caremonth-measurements-calendar>.ui-datepicker-inline {
     width: 100%;
 }
-#caremonth-measurements-calendar .ui-datepicker-prev,
-#caremonth-measurements-calendar .ui-datepicker-next {
+.caremonth-measurements-calendar .ui-datepicker-prev,
+.caremonth-measurements-calendar .ui-datepicker-next {
     display: none;
 }
 #simpleSMSReminderComponent input[type="time"] {

+ 5 - 3
resources/views/app/patient/care-month/dashboard.blade.php

@@ -20,6 +20,8 @@
             "value" => $shortcut->text
         ];
     }
+
+    $calendarID = rand(10000, 99999);
     ?>
     <script>window.userShortcuts = <?= json_encode($shortCutsObject); ?>;</script>
 
@@ -343,7 +345,7 @@
                     </div>
                     <div class="row mb-3 d-none">
                         <div class="col-9">
-                            <div id="caremonth-measurements-calendar">
+                            <div id="caremonth-measurements-calendar-{{$calendarID}}" class="caremonth-measurements-calendar">
 
                             </div>
                         </div>
@@ -2181,8 +2183,8 @@
 
                 // init calendar view
                 @if(count($plottableMeasurements))
-                $('#caremonth-measurements-calendar').closest('.d-none').removeClass('d-none');
-                let measurementsCalendar = new FullCalendar.Calendar($('#caremonth-measurements-calendar')[0], {
+                $('#caremonth-measurements-calendar-{{$calendarID}}').closest('.d-none').removeClass('d-none');
+                let measurementsCalendar = new FullCalendar.Calendar($('#caremonth-measurements-calendar-{{$calendarID}}')[0], {
                     headerToolbar: false,
                     initialView: 'dayGridMonth',
                     initialDate: '{{ date('Y-m-d', strtotime($careMonth->created_at)) }}',

+ 1 - 1
resources/views/app/patient/rm-setup.blade.php

@@ -372,7 +372,7 @@
             <span class="width-200px">Measurement days this month:</span>
             <div class="ml-3">
                 <b>{{$careMonth->number_of_days_with_remote_measurements}} days</b>
-                <div id="caremonth-measurements-calendar" class="width-300px mt-2"></div>
+                <div id="caremonth-measurements-calendar" class="width-300px mt-2 caremonth-measurements-calendar"></div>
             </div>
         </div>