Merge branch 'main' of http://192.168.1.200:3000/Stratawiz/Rapport-Laravel
This commit is contained in:
commit
4de0ddf283
|
|
@ -73,14 +73,16 @@
|
||||||
<th>Reason For Not-Executing</th>
|
<th>Reason For Not-Executing</th>
|
||||||
<th>Patient Screened</th>
|
<th>Patient Screened</th>
|
||||||
<th>Patient Diagnosed</th>
|
<th>Patient Diagnosed</th>
|
||||||
{{-- <th>Foracort Rx</th> --}}
|
|
||||||
<th>Seroflo Rx</th>
|
<th>Seroflo Rx</th>
|
||||||
{{-- <th>Duolin Rx</th> --}}
|
<th>Maxiflo Rx</th>
|
||||||
<th>Aerocort Rx</th>
|
<th>Voltido Rx</th>
|
||||||
{{-- <th>Glycohale FB Rx</th> --}}
|
<th>Voltido Trio Rx</th>
|
||||||
<th>E-Voltido Rx</th>
|
<th>Indaflo Rx</th>
|
||||||
{{-- <th>E- Foracort G Rx</th> --}}
|
<th>Budecort Rx</th>
|
||||||
<th>E-Synchrobreathe range Rx</th>
|
<th>Levolin Rx</th>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
@ -124,14 +126,15 @@
|
||||||
<td>{{ isset($sub->formdata->reason) ? $sub->formdata->reason : '' }}</td>
|
<td>{{ isset($sub->formdata->reason) ? $sub->formdata->reason : '' }}</td>
|
||||||
<td>{{ isset($sub->formdata->patient_screened) ? $sub->formdata->patient_screened : '' }}</td>
|
<td>{{ isset($sub->formdata->patient_screened) ? $sub->formdata->patient_screened : '' }}</td>
|
||||||
<td>{{ isset($sub->formdata->patients_diagnosed) ? $sub->formdata->patients_diagnosed : '' }}</td>
|
<td>{{ isset($sub->formdata->patients_diagnosed) ? $sub->formdata->patients_diagnosed : '' }}</td>
|
||||||
{{-- <td>{{ isset($sub->formdata->foracort_rx) ? $sub->formdata->foracort_rx : '' }}</td> --}}
|
|
||||||
<td>{{ isset($sub->formdata->seroflo_rx) ? $sub->formdata->seroflo_rx : '' }}</td>
|
<td>{{ isset($sub->formdata->seroflo_rx) ? $sub->formdata->seroflo_rx : '' }}</td>
|
||||||
{{-- <td>{{ isset($sub->formdata->duolin_rx) ? $sub->formdata->duolin_rx : '' }}</td> --}}
|
<td>{{ isset($sub->formdata->maxiflo_rx) ? $sub->formdata->maxiflo_rx : '' }}</td>
|
||||||
<td>{{ isset($sub->formdata->aerocort_rx) ? $sub->formdata->aerocort_rx : '' }}</td>
|
<td>{{ isset($sub->formdata->voltido_rx) ? $sub->formdata->voltido_rx : '' }}</td>
|
||||||
{{-- <td>{{ isset($sub->formdata->glycohale_fb_rx) ? $sub->formdata->glycohale_fb_rx : '' }}</td> --}}
|
<td>{{ isset($sub->formdata->voltido_trio_rx) ? $sub->formdata->voltido_trio_rx : '' }}</td>
|
||||||
<td>{{ isset($sub->formdata->e_voltido_rx) ? $sub->formdata->e_voltido_rx : '' }}</td>
|
<td>{{ isset($sub->formdata->indaflo_rx) ? $sub->formdata->indaflo_rx : '' }}</td>
|
||||||
{{-- <td>{{ isset($sub->formdata->e_foracort_g_rx) ? $sub->formdata->e_foracort_g_rx : '' }}</td> --}}
|
<td>{{ isset($sub->formdata->budecort_rx) ? $sub->formdata->budecort_rx : '' }}</td>
|
||||||
<td>{{ isset($sub->formdata->e_synchrobreathe_range_rx) ? $sub->formdata->e_synchrobreathe_range_rx : '' }}</td>
|
<td>{{ isset($sub->formdata->levolin_rx) ? $sub->formdata->levolin_rx : '' }}</td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -158,14 +161,13 @@
|
||||||
'reason',
|
'reason',
|
||||||
'patient_screened',
|
'patient_screened',
|
||||||
'patients_diagnosed',
|
'patients_diagnosed',
|
||||||
'foracort_rx',
|
|
||||||
'seroflo_rx',
|
'seroflo_rx',
|
||||||
'duolin_rx',
|
'maxiflo_rx',
|
||||||
'aerocort_rx',
|
'voltido_rx',
|
||||||
'glycohale_fb_rx',
|
'voltido_trio_rx',
|
||||||
'e_voltido_rx',
|
'indaflo_rx',
|
||||||
'e_foracort_g_rx',
|
'budecort_rx',
|
||||||
'e_synchrobreathe_range_rx'
|
'levolin_rx'
|
||||||
]))
|
]))
|
||||||
@continue
|
@continue
|
||||||
@endif
|
@endif
|
||||||
|
|
@ -486,28 +488,33 @@
|
||||||
}
|
}
|
||||||
}) */
|
}) */
|
||||||
|
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').parent().hide();
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').parent().hide();
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').attr('required',false);
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').attr('required',false);
|
||||||
|
|
||||||
$('#execution-execution').on('change',function(){
|
$('#execution-execution').on('change',function(){
|
||||||
let value=$('#execution-execution').val();
|
let value=$('#execution-execution').val();
|
||||||
if(value==='Yes'){
|
if(value==='Yes'){
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').parent().show();
|
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').attr('required',true);
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').parent().show();
|
||||||
$('#execution-reason').parent().hide();
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').attr('required',true);
|
||||||
$('#execution-reason').prop('required',false);
|
|
||||||
$('#execution-form input.dynamic-hidden').remove();
|
$('#execution-form input.dynamic-hidden').remove();
|
||||||
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="executed" value="1">');
|
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="executed" value="1">');
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else{
|
else if(value==='No'){
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').parent().hide();
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').parent().hide();
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx').attr('required',false);
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').attr('required',false);
|
||||||
$('#execution-reason').parent().show();
|
$('#execution-reason').parent().show();
|
||||||
$('#execution-reason').prop('required',true);
|
$('#execution-reason').attr('required',true);
|
||||||
$('#execution-form input.dynamic-hidden').remove();
|
$('#execution-form input.dynamic-hidden').remove();
|
||||||
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="not_executed" value="0">');
|
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="not_executed" value="0">');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').parent().hide();
|
||||||
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-reason,#execution-seroflo_rx,#execution-maxiflo_rx,#execution-voltido_rx,#execution-voltido_trio_rx,#execution-indaflo_rx,#execution-budecort_rx,#execution-levolin_rx').attr('required',false);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
<br>
|
<br>
|
||||||
@endif
|
@endif
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<h4 class="page-title">(RA-1)Catch Up Camp</h4>
|
<h4 class="page-title">(RA-1) Catch Up Camp</h4>
|
||||||
</div>
|
</div>
|
||||||
@if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes'))
|
@if (!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes'))
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
|
|
@ -491,13 +491,20 @@
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else{
|
else if(value==='No'){
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').parent().hide();
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').parent().hide();
|
||||||
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').attr('required',false);
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').attr('required',false);
|
||||||
$('#execution-reason').parent().show();
|
$('#execution-reason').parent().show();
|
||||||
$('#execution-reason').prop('required',true);
|
$('#execution-reason').prop('required',true);
|
||||||
$('#execution-form input.dynamic-hidden').remove();
|
$('#execution-form input.dynamic-hidden').remove();
|
||||||
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="not_executed" value="0">');
|
$('#execution-form').append('<input type="hidden" class="dynamic-hidden" name="not_executed" value="0">');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
else{
|
||||||
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').parent().hide();
|
||||||
|
$('#execution-execution_date,#execution-patient_screened,#execution-patients_diagnosed,#execution-foracort_rx,#execution-seroflo_rx,#execution-duolin_rx,#execution-aerocort_rx,#execution-glycohale_fb_rx,#execution-e_voltido_rx,#execution-e_foracort_g_rx,#execution-e_synchrobreathe_range_rx,#execution-foracort_g_rx').attr('required',false);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue