diff --git a/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php b/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php
index dbeee750..a9084445 100644
--- a/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php
+++ b/resources/views/form/rapport-team4/1741155802-25a7600f-1613-4a82-af1d-f460a8f79ffa.blade.php
@@ -60,7 +60,7 @@
Camp Plan Date |
Execution Done |
Doctor Name |
- Other Doctor Name |
+ {{-- Other Doctor Name | --}}
Camp Execution Date |
Reporting Date |
@@ -110,19 +110,19 @@
$today=date('d',strtotime("-1 months"));
?>
- @if($sub->workflow_status == 'approved')
+
@if ( $planDate && $planDate->between($startOfCurrentMonth, $fifthOfNextMonth) && $now->greaterThanOrEqualTo($planDate))
- @endif
- @elseif ($sub->workflow_status == 'rejected' ||
+
+ {{-- @elseif ($sub->workflow_status == 'rejected' ||
(isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'no'))
+ --}}
@endif
@@ -142,17 +142,18 @@
{{ '' }}
@endif
-
+
+ {{-- |
@if (isset($sub->formdata->contact_id_2) && $sub->formdata->contact_id_2
!== '')
{{ $sub->formdata->contact_id_2 }}
@elseif (isset($sub->formdata->doctor_name))
{{ $sub->formdata->doctor_name }}
@else
- {{-- Default value or empty string, adjust as needed --}}
+
{{ '' }}
@endif
- |
+ --}}
{{$sub->formdata->execution_date}} |
{{isset($sub->formdata->record_date ) ? $sub->formdata->record_date : ''}}
|
@@ -247,16 +248,20 @@
@if ($question->code == 'contact_id')
@foreach ($question->options as $option)
- @if( isset($option->contact->ardc_camp_doctor_octnov) && $option->contact->ardc_camp_doctor_octnov == 'Yes' )
-
- @endif
+
@endforeach
-
+ --}}
@elseif($question->code=='contact_id_2')
@foreach ($question->options as $option)
@@ -534,7 +539,7 @@
});
$('#execution-total_rxns').prop({"readonly":true});
- $('#execution-executed_as_per_plan').prop("disabled",true);
+ //$('#execution-executed_as_per_plan').prop("disabled",true);
// $('#execution-patients_diagnosed').on('change',function(){
// let a=document.getElementById('execution-patients_diagnosed');
@@ -572,10 +577,10 @@
e.preventDefault();
})
- let contact2 = document.getElementById('execution-contact_id_2');
+ /* let contact2 = document.getElementById('execution-contact_id_2');
contact2.addEventListener('mousedown', function(e) {
e.preventDefault();
- })
+ }) */
let camp_planned_start = document.getElementById('execution-camp_planned_start_time');
@@ -666,6 +671,8 @@
$('#execution-form').append('');
})
+
+ /*
$('.edit-plan-btn').click(function() {
$('#execution-form-wrapper').show(100, () => {
$('#add-camp-btn').hide(0);
@@ -772,6 +779,10 @@
}
})
+ */
+
+
+
$('#report-form').on('submit', function(event) {
event.preventDefault();
@@ -819,12 +830,30 @@
- $('#field-contact_id').change(function() {
+ /*$('#field-contact_id').change(function() {
$('#field-speciality').val($('option:selected', this).attr('speciality'))
})
$('#field-contact_id').change(function() {
$('#field-msl_code').val($('option:selected', this).attr('legacy_code'))
+ })*/
+
+
+ $('#field-contact_id').change(function() {
+ $('#field-speciality').val($('option:selected', this).attr('speciality'))
+ $('#field-msl_code').val($('option:selected', this).attr('legacy_code'))
+ let restricted=$(this).find(":selected").attr('ardc_css_restricted_drs');
+ console.log("restricted:",restricted);
+ if (restricted === 'Yes') {
+
+ alert('Planning with these Doctors not allowed');
+
+ // Deselect current option
+ $(this).val('').trigger('change');
+
+ // Clear msl code as well
+ $('#field-msl_code').val('');
+ }
})
@@ -974,6 +1003,95 @@
});
+
+
+
+