diff --git a/lib/constants/app_constants.dart b/lib/constants/app_constants.dart index e5c0a44..838f127 100644 --- a/lib/constants/app_constants.dart +++ b/lib/constants/app_constants.dart @@ -6,7 +6,7 @@ Logger logger = Logger(printer: PrettyPrinter(printEmojis: false, colors: true, // app globals -bool isNeedToBreakVoiceForArabic = false; +bool isNeedToBreakVoiceForArabic = true; bool isSpeechCompleted = true; class AppStrings { @@ -112,7 +112,7 @@ class ApiConstants { //Generic static String createTicketForKiosk = '$baseUrlApiGen/GEN_PatientCallNo_Get'; - static String ticketAcknowledgementInsert = '$baseUrlApiGen/GEN_TicketQueueAck_Insert'; + static String ticketAcknowledgementInsert = '$baseUrlApi/Common/TicketQueueAck_Insert'; // Signal R Constants @@ -134,3 +134,15 @@ class CacheConstants { // "editedBy": 102, // "apiKey": "EE17D21C7943485D9780223CCE55DCE5" // } + +// calling for RAD +//{ +// "projectID": 12, +// "patientID": 0, +// "orderNo": "12", +// "invoiceNo": "12", +// "isVip": true, +// "isVidaPlus": false, +// "createdBy": 101, +// "apiKey": "EE17D21C7943485D9780223CCE55DCE5" +// } diff --git a/lib/repositories/screen_details_repo.dart b/lib/repositories/screen_details_repo.dart index 202a5ab..6a19818 100644 --- a/lib/repositories/screen_details_repo.dart +++ b/lib/repositories/screen_details_repo.dart @@ -7,6 +7,8 @@ import 'package:hmg_qline/models/prayers_widget_model.dart'; import 'package:hmg_qline/models/rss_feed_model.dart'; import 'package:hmg_qline/models/weathers_widget_model.dart'; import 'package:hmg_qline/models/widgets_config_model.dart'; +import 'package:hmg_qline/utilities/enums.dart'; +import 'package:hmg_qline/utilities/extensions.dart'; import 'package:hmg_qline/views/view_helpers/info_components.dart'; abstract class ScreenDetailsRepo { @@ -24,7 +26,7 @@ abstract class ScreenDetailsRepo { Future getRssFeedDetailsByLanguageID({required int languageId}); - Future acknowledgeTicket({required String ipAddress}); + Future acknowledgeTicket({required String ipAddress, required String ticketQueueID, required QTypeEnum qTypeEnum}); } class ScreenDetailsRepoImp implements ScreenDetailsRepo { @@ -196,15 +198,12 @@ class ScreenDetailsRepoImp implements ScreenDetailsRepo { } @override - Future acknowledgeTicket({required String ipAddress}) async { + Future acknowledgeTicket({required String ipAddress, required String ticketQueueID, required QTypeEnum qTypeEnum}) async { try { var params = { "ipAddress": ipAddress.toString(), - "isVip": false, - "orderNo": "123", - "isVidaPlus": false, - "createdBy": "101", - "apiKey": AppConstants.apiKey, + "ticketQueueID": ticketQueueID.toString(), + "qType": qTypeEnum.getQTypeIDFromEnum().toString(), }; GenericRespModel adsGenericModel = await apiClientInstance.postJsonForObject( (json) => GenericRespModel.fromJson(json), diff --git a/lib/services/text_to_speech_service.dart b/lib/services/text_to_speech_service.dart index 1b363cc..253c48e 100644 --- a/lib/services/text_to_speech_service.dart +++ b/lib/services/text_to_speech_service.dart @@ -118,11 +118,11 @@ class TextToSpeechServiceImp implements TextToSpeechService { await textToSpeechInstance.speak("$preVoice "); } textToSpeechInstance.setLanguage(LanguageEnum.english.enumToString()); - await textToSpeechInstance.speak("$patientAlpha .. $patientNumeric .."); + await textToSpeechInstance.speak("$patientAlpha .. $patientNumeric"); textToSpeechInstance.setLanguage(langEnum.enumToString()); - await textToSpeechInstance.speak(postVoice); - textToSpeechInstance.setLanguage(LanguageEnum.english.enumToString()); - await textToSpeechInstance.speak(roomNo).whenComplete(() { + // await textToSpeechInstance.speak(postVoice); + // textToSpeechInstance.setLanguage(LanguageEnum.english.enumToString()); + await textToSpeechInstance.speak("$postVoice .. $roomNo").whenComplete(() { isSpeechCompleted = true; }); } else { diff --git a/lib/view_models/queuing_view_model.dart b/lib/view_models/queuing_view_model.dart index 3d99737..59827ef 100644 --- a/lib/view_models/queuing_view_model.dart +++ b/lib/view_models/queuing_view_model.dart @@ -151,7 +151,9 @@ class QueuingViewModel extends ChangeNotifier { Future callTicketOnScreen({required TicketData? ticketData}) async { if (ticketData == null) return; - GlobalConfigurationsModel globalConfigurationsModel = getIt.get().globalConfigurationsModel; + ScreenConfigViewModel screenConfigViewModel = getIt.get(); + GlobalConfigurationsModel globalConfigurationsModel = screenConfigViewModel.globalConfigurationsModel; + screenConfigViewModel.acknowledgeTicket(ticketQueueID: ticketData.id!.toString()); if (globalConfigurationsModel.isToneReq) { isCallingInProgress = true; await audioService.playTone(path: AppAssets.callTone); diff --git a/lib/view_models/screen_config_view_model.dart b/lib/view_models/screen_config_view_model.dart index e23c7c7..ee38968 100644 --- a/lib/view_models/screen_config_view_model.dart +++ b/lib/view_models/screen_config_view_model.dart @@ -348,11 +348,17 @@ class ScreenConfigViewModel extends ChangeNotifier { } } - Future acknowledgeTicket({required String ticketNumber}) async { - GenericRespModel? response = await screenDetailsRepo.acknowledgeTicket(ipAddress: currentScreenIP); + Future acknowledgeTicket({required String ticketQueueID}) async { + GenericRespModel? response = await screenDetailsRepo.acknowledgeTicket( + ipAddress: currentScreenIP, + ticketQueueID: ticketQueueID, + qTypeEnum: globalConfigurationsModel.qTypeEnum, + ); if (response == null || response.messageStatus != 1) { - log("response null from acknowledgeTicket"); + logger.e("response null from acknowledgeTicket"); return; + } else { + logger.i("response from acknowledgeTicket ${response.data}"); } } }