Merge branch 'main' of http://192.168.1.200:3000/Stratawiz/Rapport-Laravel
Specific Folder FTP Upload / ftp-deploy (push) Successful in 28s Details

This commit is contained in:
Tanuja Pansare 2026-11-04 16:14:43 +05:30
commit c6ffd0759f
4 changed files with 639 additions and 31 deletions

View File

@ -95,8 +95,25 @@ class TgicsHelper
return strtolower(trim((string) $value)) === 'yes';
}
/**
* Read validation flag from a contact object (supports attribute_ prefix).
*/
public static function contactHasWhatsappValidated($item): bool
{
if (!$item) {
return false;
}
$direct = $item->tgics_whatsapp_validated ?? null;
if (self::isWhatsappValidatedFlag($direct)) {
return true;
}
$prefixed = $item->attribute_tgics_whatsapp_validated ?? null;
return self::isWhatsappValidatedFlag($prefixed);
}
/**
* Map contact_id => whether WhatsApp is validated for TGICS.
* Prefers TGICS API (same RAPPORT token that wrote the flag); falls back to contact/get_one.
*
* @param array<int, string> $contactIds
* @return array<string, bool>
@ -111,22 +128,61 @@ class TgicsHelper
return [];
}
$status = array_fill_keys($ids, false);
$base = rtrim((string) env('TGICS_API_BASE', ''), '/');
if ($base !== '') {
try {
$response = Http::timeout(10)->acceptJson()->get($base.'/api/whatsapp/status', [
'contact_ids' => implode(',', $ids),
]);
if ($response->successful()) {
$json = $response->json();
$validatedRaw = $json['data']['validated'] ?? [];
foreach ($ids as $id) {
$status[$id] = !empty($validatedRaw[$id]);
}
Log::info('[TGICS_WA_STATUS] via TGICS API', [
'ids' => $ids,
'status' => $status,
'http' => $response->status(),
]);
return $status;
}
Log::warning('TGICS WhatsApp status request failed', [
'status' => $response->status(),
'body' => $response->body(),
]);
} catch (\Throwable $e) {
Log::warning('[TGICS_WA_STATUS] TGICS API error: '.$e->getMessage());
}
} else {
Log::warning('TGICS_API_BASE is not configured; falling back to Rapport contact/get_one');
}
// Fallback: Rapport via a lifemankind user token from local users table
$accessToken = self::resolveContactAccessToken($domain);
if ($accessToken === '') {
Log::warning('TGICS WhatsApp validation: no contact access token for domain '.$domain);
return array_fill_keys($ids, false);
return $status;
}
$status = array_fill_keys($ids, false);
foreach ($ids as $id) {
try {
$resp = LambdaRequest::getrequest('contact', 'contact/get_one', ['id' => $id], $accessToken);
$item = $resp->data->item ?? null;
if ($item && self::isWhatsappValidatedFlag($item->tgics_whatsapp_validated ?? '')) {
$status[$id] = true;
}
$validated = self::contactHasWhatsappValidated($item);
$status[$id] = $validated;
Log::info('[TGICS_WA_STATUS] contact lookup fallback', [
'contact_id' => $id,
'validated' => $validated,
'flag' => $item->tgics_whatsapp_validated ?? ($item->attribute_tgics_whatsapp_validated ?? null),
'api_status' => $resp->status ?? null,
]);
} catch (\Throwable $e) {
Log::warning('TGICS WhatsApp validation lookup failed for '.$id.': '.$e->getMessage());
Log::warning('[TGICS_WA_STATUS] lookup failed for '.$id.': '.$e->getMessage());
}
}

View File

@ -1705,6 +1705,43 @@ class FormController extends Controller
}
}
// Team3 doctor tagging (single submit): mark attribute = Yes on selected doctor(s)
$team3DrTagAttributes = [
'1793772514-e8e67206-8dba-471e-b08f-deece5d36d11' => 'levoswitch_drs',
'1793767249-069bf040-1469-4117-b364-e4851e1f4bdf' => 'toba_titans_drs',
];
if (isset($team3DrTagAttributes[$formdata->form_id])) {
$tagAttribute = $team3DrTagAttributes[$formdata->form_id];
$rawContactIds = $post['contact_id'] ?? [];
if (!is_array($rawContactIds)) {
$rawContactIds = [$rawContactIds];
}
$contactIds = [];
foreach ($rawContactIds as $contactId) {
$contactId = trim((string) $contactId);
if ($contactId !== '' && strcasecmp($contactId, 'others') !== 0) {
$contactIds[] = $contactId;
}
}
$contactIds = array_values(array_unique($contactIds));
if ($contactIds !== [] && !empty($formdata->partition)) {
list($application, $domain) = explode('-', $formdata->partition);
$token = DB::table('users')->select('access_token')->where('domain', $domain)->where('permissions', 'like', '%contact_create%')->orderBy('updated_at', 'desc')->skip(0)->take(1)->get();
$userId = trim((string) ($post['user_id'] ?? ($formdata->user_id ?? '')));
if ($token->isNotEmpty() && $userId !== '') {
foreach ($contactIds as $contactId) {
LambdaRequest::postrequest('contact', 'contact/update', [
'domain' => $domain,
'application' => $application,
'user_id' => $userId,
'id' => $contactId,
$tagAttribute => 'Yes',
], $token[0]->access_token);
}
}
}
}
if($formdata->form_id == '1757055046-ba0eff4e-0d4a-4e90-b190-c59f12ef6edd') {
// if(isset($post['cresar_bs_launched']) && $post['cresar_bs_launched'] == 'Yes' ) {
list($application, $domain) = explode("-", $formdata->partition);
@ -8104,6 +8141,40 @@ class FormController extends Controller
]);
}
// Team3 doctor tagging: mark attribute = Yes on each selected doctor
$team3DrTagAttributes = [
'1793772514-e8e67206-8dba-471e-b08f-deece5d36d11' => 'levoswitch_drs',
'1793767249-069bf040-1469-4117-b364-e4851e1f4bdf' => 'toba_titans_drs',
];
if (isset($team3DrTagAttributes[$formdata->form_id])) {
$tagAttribute = $team3DrTagAttributes[$formdata->form_id];
$contactIds = [];
if (!empty($post['contact_id']) && is_array($post['contact_id'])) {
foreach ($post['contact_id'] as $contactId) {
$contactId = trim((string) $contactId);
if ($contactId !== '' && strcasecmp($contactId, 'others') !== 0) {
$contactIds[] = $contactId;
}
}
}
$contactIds = array_values(array_unique($contactIds));
if ($contactIds !== [] && !empty($formdata->partition)) {
list($application, $domain) = explode('-', $formdata->partition);
$token = DB::table('users')->select('access_token')->where('domain', $domain)->where('permissions', 'like', '%contact_create%')->orderBy('updated_at', 'desc')->skip(0)->take(1)->get();
$userId = trim((string) ($post['user_id'] ?? ($formdata->user_id ?? '')));
if ($token->isNotEmpty() && $userId !== '') {
foreach ($contactIds as $contactId) {
LambdaRequest::postrequest('contact', 'contact/update', [
'domain' => $domain,
'application' => $application,
'user_id' => $userId,
'id' => $contactId,
$tagAttribute => 'Yes',
], $token[0]->access_token);
}
}
}
}
if(isset($formdata) && !empty($formdata) && $formdata->user_id != '') {
$post = $this->applyPobAmounts($post);
@ -13550,6 +13621,11 @@ class FormController extends Controller
}
$validated = \App\Helpers\TgicsHelper::isContactWhatsappValidated($contactId, $domain);
\Log::info('[TGICS_WA_STATUS] poll', [
'contact_id' => $contactId,
'domain' => $domain,
'validated' => $validated,
]);
return response()->json([
'status' => 'success',

View File

@ -866,41 +866,50 @@
$('body').addClass('modal-open');
}
function checkTgicsWaStatus(contactId) {
return $.ajax({
type: 'GET',
url: '/form/tgicswhatsappstatus',
data: {
contact_id: contactId,
partition: 'rapport-lifemankind'
}
}).then(function(res) {
if (res && res.status === 'success' && res.data && res.data.validated) {
stopTgicsWaPoll();
$('#tgics-validate-wa-status').text('Validated!');
Swal.fire({
icon: 'success',
title: 'WhatsApp validated',
text: 'You can now send the survey link to this doctor.',
timer: 1800,
showConfirmButton: false
}).then(function() {
window.location.reload();
});
return true;
}
return false;
}, function(err) {
console.warn('[TGICS_WA_STATUS] poll failed', err);
return false;
});
}
function startTgicsWaPoll(contactId) {
stopTgicsWaPoll();
tgicsWaPollStartedAt = Date.now();
$('#tgics-validate-wa-status').text('Waiting for validation…');
// Immediate check, then every 2s
checkTgicsWaStatus(contactId);
tgicsWaPollTimer = setInterval(function() {
if (Date.now() - tgicsWaPollStartedAt > 120000) {
stopTgicsWaPoll();
$('#tgics-validate-wa-status').text('Still waiting. Close and try Validate again after the doctor sends the message.');
return;
}
$.ajax({
type: 'GET',
url: '/form/tgicswhatsappstatus',
data: {
contact_id: contactId,
partition: 'rapport-lifemankind'
},
success: function(res) {
if (res && res.status === 'success' && res.data && res.data.validated) {
stopTgicsWaPoll();
$('#tgics-validate-wa-status').text('Validated!');
Swal.fire({
icon: 'success',
title: 'WhatsApp validated',
text: 'You can now send the survey link to this doctor.',
timer: 1800,
showConfirmButton: false
}).then(function() {
window.location.reload();
});
}
}
});
}, 3000);
checkTgicsWaStatus(contactId);
}, 2000);
}
$(document).on('click', '.tgics-validate-wa-btn', function(e) {

View File

@ -0,0 +1,467 @@
<!DOCTYPE html>
<html lang="en">
<head>
@include('layouts.shared/title-meta', ['title' => "Form"])
@include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
<link href="{{asset('assets/libs/sweetalert2/sweetalert2.min.css')}}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/libs/select2/select2.min.css') }}" rel="stylesheet" type="text/css" />
</head>
<div id="pageloader">
<img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
</div>
<body class="loading">
<div class="account-pages">
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8 col-lg-6 col-xl-5 p-0">
<div class="card bg-pattern">
<div class="card-body p-3 row">
@if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
<br>@endif
@if(session('success'))<div class=" alert alert-success">{{ session('success') }}
</div>
<br>@endif
<div class="col-8">
<h4 class="page-title">{{$form->title}}</h4>
</div>
@if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
<div class="col-4">
@if($form->link_type == 'form')
<a href="/form/history" class="float-end pt-1">View History</a>
@else
<a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
@endif
</div>
@endif
@if(isset($form->user_info))
<div class="col-12">
<h6>Submitted By: {{$form->user_info->name}}</h6>
</div>
@endif
@php
$submissions = Formhelper::getMultiformData( $form->partition, $form_id, $form->user_id);
$submissions = $submissions->data->submissions;
echo "<pre>";
print_r($submissions);
echo "</pre>";
@endphp
@if(count($submissions) <=4)
<form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
<input type="hidden" name="form_id" value="{{$form_id}}">
<input type="hidden" name="user_id" value="{{$form->user_id}}">
@csrf
@if($id)
<input type="hidden" name="id" value="{{$id}}">
@endif
@foreach($questions as $question)
<div class="col-md-12 mb-2">
<label for="field-{{$question->code}}" class="form-label">{{$question->question}} {!!$question->required == 'yes' ? '<span class="text-danger">*</span>':''!!} </label>
@switch($question->type)
@case('hidden')
<input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" value="{{isset($question->value)?$question->value:''}}">
@break
@case('text')
@case('email')
@case('tel')
@case('date')
<input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:''}}">
@break
@case('number')
<input type="{{$question->type}}" min="0" max="9999999999" step="1" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:0}}">
@break
@case('textarea')
<textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
@break
@case('dropdown')
<select class="form-control" id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
<option value=""> -- Select -- </option>
@foreach ($question->options as $option)
@if($question->code == 'contact_id' && isset($option->contact->type) && $option->contact->type == 'doctor' )
<option value="{{ $option->value }}"
@if(isset($question->value) && $question->value == $option->value) selected @endif
@if($question->code == 'contact_id')
msl_code="{{ (isset($option->contact->legacy_code) ? $option->contact->legacy_code : '') }}"
speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
@endif
>
{{ $option->display }}
</option>
@elseif($question->code != 'contact_id')
<option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
{{ $option->display }}
</option>
@endif
@endforeach
</select>
@break
@case('checkbox')
@foreach($question->options as $option)
<div class="form-check mb-2 form-check-primary">
<input class="form-check-input" type="checkbox" id="field-{{$question->code}}-{{$option->value}}" name="{{$question->code}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
<label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
</div>
@endforeach
@break
@case('file')
@if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
<input type="file" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" value="" {{$question->required == 'yes'?'required':'' }}>
@elseif(isset($question->value))
<img src="{{$question->value}}" class="img-fluid">
@endif
@break
@case('multitextbox')
<div class="row">
@foreach($question->options as $option)
<div class="col-6">{{$option->display}}</div>
<div class="col-6 mb-1">
<input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
</div>
@endforeach
</div>
@break
@case('time')
<input type="time"
id="field-{{$question->code}}"
name="{{$question->code}}"
class="form-control"
{{$question->required == 'yes' ? 'required' : ''}}
value="{{isset($question->value) ? $question->value : ''}}">
@break
@endswitch
</div>
@endforeach
@if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
<div class="text-center d-grid mt-3">
<button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
</div>
@endif
</form>
@else
<div class="alert alert-danger">You have already submitted 5 Doctors <div>
@endif
</div> <!-- end card-body -->
</div>
<!-- end card -->
<!-- end row -->
</div> <!-- end col -->
</div>
<!-- end row -->
</div>
<!-- end container -->
</div>
<!-- end page -->
<style type="text/css">
#pageloader {
background: rgba( 255, 255, 255, 0.8 );
display: none;
height: 100%;
position: fixed;
width: 100%;
z-index: 9999;
}
#pageloader img {
left: 50%;
margin-left: -32px;
margin-top: -32px;
position: absolute;
top: 50%;
}
</style>
@include('layouts.shared/footer-script')
<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
<script src="{{ asset('assets/libs/select2/select2.min.js') }}"></script>
<script type="text/javascript">
jQuery(document).ready(function($){
$('[data-toggle="select2"]').select2();
var hierarcies = [];
var contacts = [];
@if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
@foreach($form->users as $option)
hierarcies.push('{{$option->hierarchy_id}}');
@endforeach
$("#pageloader").fadeIn();
Promise.all(
hierarcies.map(hierarchy => {
return $.ajax({
type: "GET",
url: '/form/getdoctorlist?partition={{$form->partition}}&hierarchy=' + hierarchy,
processData: false,
contentType: false
}).then(data => {
console.log(data);
contacts = contacts.concat(data);
}).catch(function(err) {
console.log(err);
});
})
).then(function() {
// All contacts loaded for each hierarchy
// Example usage: console.log(contacts);
// Filter out contacts where value == 'sample'
contacts = contacts.filter(function(itm) { return itm.value !== 'sample'; });
console.log(contacts);
// Loop through contacts and append options to select elements whose id starts with 'field-contact_id'
// We assume contact_id fields may be suffixed, e.g. field-contact_id_1, field-contact_id, etc.
function applySelect2ToDoctorDropdowns() {
$("[id^='field-contact_id']").each(function () {
var select = $(this);
// Avoid re-initializing select2
if (select.data("select2")) return;
select.select2({
width: "100%",
placeholder: "-- Select --",
allowClear: true
});
});
}
function enforceUniqueDoctorSelections() {
var selectedValues = [];
// Collect selected values (ignore empty)
$("[id^='field-contact_id']").each(function () {
var v = $(this).val();
if (v) selectedValues.push(String(v));
});
// Reset all option disabled states, then disable duplicates across selects
$("[id^='field-contact_id']").each(function () {
var currentSelect = $(this);
var currentVal = currentSelect.val() ? String(currentSelect.val()) : "";
currentSelect.find("option").prop("disabled", false);
// Disable values selected in OTHER selects (keep current selection enabled)
selectedValues.forEach(function (v) {
if (v && v !== currentVal) {
currentSelect
.find("option[value=\"" + v.replace(/"/g, '\\"') + "\"]")
.prop("disabled", true);
}
});
// Refresh select2 UI if present
if (currentSelect.data("select2")) {
currentSelect.trigger("change.select2");
}
});
}
$("[id^='field-contact_id']").each(function() {
var select = $(this);
// Clear previous options
select.html('');
// Add a default 'Select' option
select.append(
$("<option></option>")
.attr("value", '')
.text('-- Select --')
);
// Append options from contacts
contacts.forEach(function(itm) {
var option = $("<option></option>")
.attr("value", itm.value)
.text(itm.display);
// If doctor options have extra attributes
if (itm.contact && itm.contact.msl_code) {
option.attr("msl_code", itm.contact.msl_code);
}
if (itm.contact && itm.contact.speciality) {
option.attr("speciality", itm.contact.speciality);
}
select.append(option);
});
// For each select element, add a change event handler to populate `msl_code` and `speciality`
// We assume dropdowns and targets follow the pattern:
// - select: field-contact_id_1, field-contact_id_2, ..., field-contact_id
// - result: field-msl_code_1, field-speciality_1, etc.
// Remove any old event handlers first to prevent duplicate bindings
select.off('change').on('change', function () {
var selected = $(this).find(':selected');
var selectId = $(this).attr('id'); // e.g., field-contact_id_1
// Extract the suffix (e.g., _1 or empty)
var match = selectId.match(/^field-contact_id(_\d+)?$/);
var suffix = match && match[1] ? match[1] : '';
// Build the target msl_code and speciality field ids
var mslCodeField = $('#field-msl_code' + suffix);
var specialityField = $('#field-speciality' + suffix);
if (mslCodeField.length) {
mslCodeField.val(selected.attr('msl_code') || '');
}
if (specialityField.length) {
specialityField.val(selected.attr('speciality') || '');
}
// Prevent selecting the same doctor across multiple dropdowns
enforceUniqueDoctorSelections();
});
// Ensure unique selection is enforced after initial render
enforceUniqueDoctorSelections();
});
// Enable search on doctor dropdowns
applySelect2ToDoctorDropdowns();
$("#pageloader").fadeOut();
});
@endif
// Loop through hierarcies and fetch contacts for each hierarchy, store in contacts variable
// $('#field-user_id').change(function(){
// let hierarchy = $('option:selected', this).attr('hierarchy');
// $('#field-hierarchy_id').val(hierarchy)
// event.preventDefault();
// $("#pageloader").fadeIn();
// $.ajax({
// type: "GET",
// url: '/form/getdoctorlist?partition={{$form->partition}}&hierarchy='+hierarchy,
// processData: false,
// contentType: false,
// success: function( data ) {
// $("#pageloader").fadeOut();
// for (let i = 1; i <= 10; i++) {
// let contactField = $('#field-contact_id_' + i);
// // Skip if field does not exist
// if (!contactField.length) continue;
// contactField.html('');
// contactField.append(
// $("<option></option>")
// .attr("value", '')
// .text('-- Select --')
// );
// for (let itm of data) {
// contactField.append(
// $("<option></option>")
// .attr("value", itm.value)
// .text(itm.display)
// .attr("msl_code", itm.contact.msl_code)
// .attr("speciality", itm.contact.speciality)
// );
// }
// // Remove old change events before binding again
// contactField.off('change').on('change', function () {
// let selected = $(this).find(':selected');
// $('#field-msl_code_' + i).val(selected.attr('msl_code') || '');
// $('#field-speciality_' + i).val(selected.attr('speciality') || '');
// console.log(selected.text()); // selected doctor name
// });
// contactField.select2({
// placeholder: "-- Select --",
// allowClear: true,
// width: '100%'
// });
// }
// },
// });
// console.log(hierarchy)
// })
// for (let i = 1; i <= 10; i++) {
// $('#field-msl_code_' + i).attr('readonly',true);
// $('#field-speciality_' + i).attr('readonly',true);
// }
$('#report-form').on('submit', function(event){
event.preventDefault();
const formData = new FormData($('#report-form')[0]);
// Log form data to console
for (let [key, value] of formData.entries()) {
console.log(key, value);
}
$("#pageloader").fadeIn();
$.ajax({
type: "POST",
url: '/form/ajaxsubmit',
data: new FormData($('#report-form')[0]),
processData: false,
contentType: false,
success: function( data ) {
$("#pageloader").fadeOut();
if(data.status == 'success') {
Swal.fire({
title: 'Great!',
text: 'Your data is successfully submitted!',
icon: 'success'
}).then(() => {
location.reload(); // 🔥 page refresh here
});
$('#report-form').trigger("reset");
} else {
Swal.fire({
icon: 'error',
title: 'Data not submitted',
text: 'Something went wrong, please try again after some time!'
})
}
},
});
});
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0');
var yyyy = today.getFullYear();
today = yyyy + '-' + mm + '-' + dd;
var plandateField = document.getElementById('field-record_date');
plandateField.setAttribute('min', "2026-11-01");
plandateField.setAttribute('max', today);
});
</script>
</body>
</html>