Stratawiz
/
Rapport-Laravel
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote main with local changes
Specific Folder FTP Upload / ftp-deploy (push) Successful in 27s Details

This commit is contained in:
Tanuja Pansare 2026-11-02 12:49:58 +05:30
parent f5b6ae5550 97edde2a79
commit 484dbb3078
7 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/FormController.php
View File

@ -417,16 +417,17 @@ class FormController extends Controller
if (isset($question->type) && $question->type == 'hidden') {
continue;
}
$col = is_object($question) && isset($question->code) ? $question->code : $code;
$value = null;
if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $code)) {
$value = $submission->formdata->{$code};
} elseif (isset($submission->{$code})) {
$value = $submission->{$code};
if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $col)) {
$value = $submission->formdata->{$col};
} elseif (isset($submission->{$col})) {
$value = $submission->{$col};
}
if (is_array($value)) {
$value = implode(', ', $value);
}
$row[$code] = $value ?? '';
$row[$col] = $value ?? '';
}
if (isset($formdata->workflow) && $formdata->workflow == 'yes') {
$row['workflow_next_approver'] = $submission->workflow_next_approver ?? '';

1
app/Http/Controllers/FormentityController.php
View File

@ -61,6 +61,7 @@ class FormentityController extends Controller
'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ],
'metric_submission' => ['title' => 'Metric Submission', 'type' => 'yesno', 'required' => true],
'metric_authkey' => ['title' => 'Auth Key', 'type' => 'text', 'required' => true],
'metric_ready_on_submit' => ['title' => 'Metric Ready On Submit', 'type' => 'yesno', 'required' => true, 'default' => 'no'],
'manager_de_roles' => ['title' => 'Manager Data Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],
// 'manager_data_child_role' => ['title' => 'Manager Data Child Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],

3
resources/views/form/list.blade.php
View File

@ -255,7 +255,8 @@
@if(isset($question->type) && $question->type == 'hidden')
@continue
@endif
{ "data": "{{$code}}", "defaultContent": "" },
@php $col = is_object($question) && isset($question->code) ? $question->code : $code; @endphp
{ "data": "{{$col}}", "defaultContent": "" },
@endforeach
@else
{ "data": "date" },

3
resources/views/form/rapport-demo/1706001346-9b6b0b23-c3b5-4b9c-a2dd-681c5787a16c.blade.php
View File

@ -84,7 +84,8 @@
<option value=""> -- Select -- </option>
@foreach ($question->options as $option)
@if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' )
{{-- @if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' ) --}}
@if($question->code == 'contact_id' && ((isset($option->contact->type) && $option->contact->type == 'doctor') || !isset($option->contact)))
<option value="{{ $option->value }}"
@if(isset($question->value) && $question->value == $option->value) selected @endif
@if($question->code == 'contact_id')

8
resources/views/form/rapport-lifemankind/1792561624-4466e937-cfb5-4679-989a-c3fea892568f.blade.php
View File

@ -129,13 +129,13 @@
}
$tgicsContactId = trim((string) ($sub->formdata->tgics_contact_id ?? ''));
$rowUserId = trim((string) ($sub->formdata->user_id ?? ($sub->user_id ?? ($form->user_id ?? ''))));
$doctorLink = $rowUserId !== ''
? 'https://tgics.cttr.in/' . $rowUserId
: $tgicsCommonLink;
$doctorLink = ($rowUserId !== '' && $tgicsContactId !== '')
? 'https://tgics.cttr.in/' . $rowUserId . '/' . $tgicsContactId
: '';
$surveysDone = $tgicsContactId !== ''
? (int) ($tgicsSurveyCounts[$tgicsContactId] ?? 0)
: 0;
$whatsappText = "Dear Doctor" . ($doctorName !== '' ? ' ' . $doctorName : '') . ",\n\nYou have been approved for TGICS (The Great Indian Cough Study).\nPlease open the link and enter your WhatsApp mobile number to continue:\n" . $doctorLink;
$whatsappText = "Dear Doctor" . ($doctorName !== '' ? ' ' . $doctorName : '') . ",\nThank you for participating in TGICS (The Great Indian Cough Study).\nPlease open the link and enter your WhatsApp mobile number to continue:\n" . $doctorLink;
$whatsappLink = ($whatsappDigits !== '' && $doctorLink !== '')
? 'https://api.whatsapp.com/send?phone=' . $whatsappDigits . '&text=' . rawurlencode($whatsappText)
: '';

4
resources/views/form/rapport-team4/1742555655-4207d1db-2554-43b0-9cdd-1d7c85142433.blade.php
View File

@ -379,6 +379,10 @@ $brandData = [
})
$('#field-nicogum_freshmint_2mg_12_nicotine_gums_samples,#field-nicogum_freshmint_4mg_12_nicotine_gums_samples').attr({max:"10"});
$('#field-montair_lc_kid_syp_units,#field-montair_lc_kid_tab_10s_units,#field-furamist_nasal_spray_units,#field-furamist_az_nasal_sp_units,#field-furamist_oxy_70_md_nasal_spray_units,#field-levolin_syrup_100ml_units,#field-levolin_1mg_tab_units,#field-levolin_2_tab_units,#field-levolin_plus_jr_100ml_oral_liquid_units,#field-levolin_plus_jr_60ml_ip_units,#field-levolin_plus_mango_flavour_100_ml_units,#field-montair_10_15s_units,#field-montair_10_15s_units,#field-montair_4mg_15_tab_units,#field-montair_5mg_15_tab_units,#field-nicogum_freshmint_4mg_12_nicotine_gums_units,#field-nicogum_freshmint_2mg_12_nicotine_gums_units,#field-nicogum_transdermal_patch_21mg_units,#field-nicogum_transdermal_patch_14mg_units,#field-nicogum_transdermal_patch_7mg_units,#field-nicogum_4_sugarfree_units,#field-montair_lc_tablets_units,#field-erdostyne_suspension_units,#field-montair_lc_adult_units,#field-erdostyne_capsule_units,#field-furamist_240mtd_units,#field-nicogum_freshmint_4mg_16_nicotine_gums_units,#field-nicogum_freshmint_2mg_16_nicotine_gums_units,#field-montair_lc_kid_5_units,#field-nicogum_freshmint_4mg_48_nicotine_gums_units,#field-nicogum_freshmint_2mg_48_nicotine_gums_units').on('change',function(){
let a=parseInt($('#field-montair_lc_kid_syp_units').val())||0;

21
resources/views/form/rapport-team4/1748864910-695ca2a4-08ff-49be-b2b5-c4087a461edd.blade.php
View File

@ -42,6 +42,25 @@ $brandData = [
];
$submissions = Formhelper::getMultiformData($form->partition, $form_id, $form->user_id);
$formdata = null;
if (!empty($submissions->data->submissions)) {
foreach ($submissions->data->submissions as $submission) {
if ($submission->id == $id) {
$formdata = $submission->formdata ?? null;
break;
}
}
}
@endphp
<body class="loading">
@ -413,6 +432,8 @@ $brandData = [
})
$('#field-nicogum_freshmint_2mg_12_nicotine_gums_samples,#field-nicogum_freshmint_4mg_12_nicotine_gums_samples').attr({max:"10"});
/* $('#field-montair_lc_kid_syp_units,#field-montair_lc_kid_tab_10s_units,#field-furamist_nasal_spray_units,#field-furamist_az_nasal_sp_units,#field-furamist_oxy_70_md_nasal_spray_units,#field-levolin_syrup_100ml_units,#field-levolin_1mg_tab_units,#field-levolin_2_tab_units,#field-levolin_plus_jr_100ml_oral_liquid_units,#field-levolin_plus_jr_60ml_ip_units,#field-levolin_plus_mango_flavour_100_ml_units,#field-montair_10_15s_units,#field-montair_10_15s_units,#field-montair_4mg_15_tab_units,#field-montair_5mg_15_tab_units,#field-nicogum_freshmint_4mg_12_nicotine_gums_units,#field-nicogum_freshmint_2mg_12_nicotine_gums_units,#field-nicogum_transdermal_patch_21mg_units,#field-nicogum_transdermal_patch_14mg_units,#field-nicogum_transdermal_patch_7mg_units,#field-nicogum_4_sugarfree_units,#field-montair_lc_tablets_units,#field-erdostyne_suspension_units,#field-montair_lc_adult_units,#field-erdostyne_capsule_units,#field-nicogum_freshmint_2mg_16_nicotine_gums_rx,#field-nicogum_freshmint_2mg_48_nicotine_gums_rx,#field-nicogum_freshmint_4mg_16_nicotine_gums_rx,#field-nicogum_freshmint_4mg_48_nicotine_gums_rx').on('change',function(){