Fixed the _ issue

master
FaizHashmiCS22 8 months ago
parent 10ff8170a0
commit 06f0b61add

@ -97,7 +97,7 @@ class PatientTicketModel {
createdOn = json['createdOn']; createdOn = json['createdOn'];
editedOn = json['editedOn']; editedOn = json['editedOn'];
queueNo = json['queueNoM']; queueNo = json['queueNoM'];
callNoStr = json['callNoStr']; callNoStr = json['callNoStr'] != null ? (json['callNoStr'] as String).replaceAll('_', '-') : "";
isQueue = json['isQueue']; isQueue = json['isQueue'];
isToneReq = json['isToneReq']; isToneReq = json['isToneReq'];
isVoiceReq = json['isVoiceReq']; isVoiceReq = json['isVoiceReq'];
@ -151,98 +151,98 @@ class PatientTicketModel {
if (callType == 5) return CallType.nebulization; if (callType == 5) return CallType.nebulization;
return CallType.vitalSign; return CallType.vitalSign;
} }
// //
// static List<PatientTicketModel> testCallPatients = [ // static List<PatientTicketModel> testCallPatients = [
// PatientTicketModel( // PatientTicketModel(
// id: 1, // id: 1,
// patientID: 112, // patientID: 112,
// mobileNo: "112", // mobileNo: "112",
// doctorName: "name", // doctorName: "name",
// doctorNameN: "nameN", // doctorNameN: "nameN",
// patientGender: 1, // patientGender: 1,
// callType: 1, // callType: 1,
// roomNo: "617", // roomNo: "617",
// createdOn: DateTime.now().millisecondsSinceEpoch.toString(), // createdOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOn: DateTime.now().millisecondsSinceEpoch.toString(), // editedOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOnTimeStamp: DateTime.now().millisecondsSinceEpoch, // editedOnTimeStamp: DateTime.now().millisecondsSinceEpoch,
// queueNo: "B-89", // queueNo: "B-89",
// callNoStr: "B-89", // callNoStr: "B-89",
// isQueue: true, // isQueue: true,
// isToneReq: true, // isToneReq: true,
// isVoiceReq: true, // isVoiceReq: true,
// concurrentCallDelaySec: 8, // concurrentCallDelaySec: 8,
// ), // ),
// PatientTicketModel( // PatientTicketModel(
// id: 1, // id: 1,
// patientID: 112, // patientID: 112,
// mobileNo: "112", // mobileNo: "112",
// doctorName: "name", // doctorName: "name",
// doctorNameN: "nameN", // doctorNameN: "nameN",
// patientGender: 1, // patientGender: 1,
// callType: 1, // callType: 1,
// roomNo: "617", // roomNo: "617",
// createdOn: DateTime.now().millisecondsSinceEpoch.toString(), // createdOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOn: DateTime.now().millisecondsSinceEpoch.toString(), // editedOn: DateTime.now().millisecondsSinceEpoch.toString(),
// queueNo: "B-89", // queueNo: "B-89",
// callNoStr: "B-89", // callNoStr: "B-89",
// isQueue: true, // isQueue: true,
// isToneReq: true, // isToneReq: true,
// isVoiceReq: true, // isVoiceReq: true,
// concurrentCallDelaySec: 8, // concurrentCallDelaySec: 8,
// ), // ),
// PatientTicketModel( // PatientTicketModel(
// id: 1, // id: 1,
// patientID: 112, // patientID: 112,
// mobileNo: "112", // mobileNo: "112",
// doctorName: "name", // doctorName: "name",
// doctorNameN: "nameN", // doctorNameN: "nameN",
// patientGender: 1, // patientGender: 1,
// callType: 1, // callType: 1,
// roomNo: "617", // roomNo: "617",
// createdOn: DateTime.now().millisecondsSinceEpoch.toString(), // createdOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOn: DateTime.now().millisecondsSinceEpoch.toString(), // editedOn: DateTime.now().millisecondsSinceEpoch.toString(),
// queueNo: "B-89", // queueNo: "B-89",
// callNoStr: "B-89", // callNoStr: "B-89",
// isQueue: true, // isQueue: true,
// isToneReq: true, // isToneReq: true,
// isVoiceReq: true, // isVoiceReq: true,
// concurrentCallDelaySec: 8, // concurrentCallDelaySec: 8,
// ), // ),
// PatientTicketModel( // PatientTicketModel(
// id: 1, // id: 1,
// patientID: 112, // patientID: 112,
// mobileNo: "112", // mobileNo: "112",
// doctorName: "name", // doctorName: "name",
// doctorNameN: "nameN", // doctorNameN: "nameN",
// patientGender: 1, // patientGender: 1,
// callType: 1, // callType: 1,
// roomNo: "617", // roomNo: "617",
// createdOn: DateTime.now().millisecondsSinceEpoch.toString(), // createdOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOn: DateTime.now().millisecondsSinceEpoch.toString(), // editedOn: DateTime.now().millisecondsSinceEpoch.toString(),
// queueNo: "B-89", // queueNo: "B-89",
// callNoStr: "B-89", // callNoStr: "B-89",
// isQueue: true, // isQueue: true,
// isToneReq: true, // isToneReq: true,
// isVoiceReq: true, // isVoiceReq: true,
// concurrentCallDelaySec: 8, // concurrentCallDelaySec: 8,
// ), // ),
// PatientTicketModel( // PatientTicketModel(
// id: 1, // id: 1,
// patientID: 112, // patientID: 112,
// mobileNo: "112", // mobileNo: "112",
// doctorName: "name", // doctorName: "name",
// doctorNameN: "nameN", // doctorNameN: "nameN",
// patientGender: 1, // patientGender: 1,
// callType: 1, // callType: 1,
// roomNo: "617", // roomNo: "617",
// createdOn: DateTime.now().millisecondsSinceEpoch.toString(), // createdOn: DateTime.now().millisecondsSinceEpoch.toString(),
// editedOn: DateTime.now().millisecondsSinceEpoch.toString(), // editedOn: DateTime.now().millisecondsSinceEpoch.toString(),
// queueNo: "B-89", // queueNo: "B-89",
// callNoStr: "B-89", // callNoStr: "B-89",
// isQueue: true, // isQueue: true,
// isToneReq: true, // isToneReq: true,
// isVoiceReq: true, // isVoiceReq: true,
// concurrentCallDelaySec: 8, // concurrentCallDelaySec: 8,
// ), // ),
// ]; // ];
} }

@ -39,19 +39,21 @@ class PriorityTickets extends StatelessWidget {
SizedBox(height: SizeConfig.getHeightMultiplier() * 1.8), SizedBox(height: SizeConfig.getHeightMultiplier() * 1.8),
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: otherTickets children: otherTickets.map((ticket) {
.map((ticket) => Padding( log("queueNoFaiz: ${ticket.callNoStr} != ${ticket.queueNo} ");
padding: EdgeInsets.only(top: SizeConfig.getHeightMultiplier() * 2),
child: TicketItem( return Padding(
ticketNo: ticket.queueNo, padding: EdgeInsets.only(top: SizeConfig.getHeightMultiplier() * 2),
callType: ticket.getCallType(), child: TicketItem(
scale: 0.8, ticketNo: ticket.queueNo,
roomNo: ticket.roomNo, callType: ticket.getCallType(),
isClinicAdded: ticket.callNoStr != ticket.queueNo, scale: 0.8,
callConfig: callConfig, roomNo: ticket.roomNo,
), isClinicAdded: ticket.callNoStr != ticket.queueNo,
)) callConfig: callConfig,
.toList(), ),
);
}).toList(),
) )
] ]
], ],
@ -80,9 +82,14 @@ class TicketItem extends StatelessWidget {
}) : super(key: key); }) : super(key: key);
String getFormattedTicket(String ticketNo, bool isClinicAdded) { String getFormattedTicket(String ticketNo, bool isClinicAdded) {
log("ticketNo: $ticketNo");
if (isClinicAdded) { if (isClinicAdded) {
var formattedString = ticketNo.split(" "); var formattedString = ticketNo.split(" ");
return "${formattedString[0]} ${formattedString[1]}"; if (formattedString.length > 1) {
return "${formattedString[0]} ${formattedString[1]}";
} else {
return ticketNo;
}
} }
return ticketNo; return ticketNo;
} }

@ -23,6 +23,11 @@ class CallByVoice {
log("ticketNo: $ticketNo"); log("ticketNo: $ticketNo");
log("isClinicNameAdded: $isClinicNameAdded"); log("isClinicNameAdded: $isClinicNameAdded");
// log("getEngines: ${await flutterTts.getEngines}");
// log("getDefaultEngine: ${await flutterTts.getDefaultEngine}");
// log("getVoices: ${await flutterTts.getVoices}");
// log("getDefaultVoice: ${await flutterTts.getDefaultVoice}");
String clinicName = ""; String clinicName = "";
String patientAlpha = ""; String patientAlpha = "";
String patientNumeric = ""; String patientNumeric = "";

@ -11,7 +11,7 @@ class Utils {
//TODO: Add translation //TODO: Add translation
String localMsg = 'Something wrong happened, please contact the admin'; String localMsg = 'Something wrong happened, please contact the admin';
if (err != null) { if (err != null) {
localMsg = localMsg + '\n \n' + err.toString(); localMsg = '$localMsg\n \n$err';
} }
return localMsg; return localMsg;
} }

Loading…
Cancel
Save