Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

bug fixes

Browse Source
merge-requests/487/head
Sultan Khan 5 years ago
parent 148ea967fb
commit 5c4aee849e
9 changed files with 157 additions and 114 deletions
Show Stats Download Patch File Download Diff File

5
lib/client/base_app_client.dart
Unescape Escape View File

@ -68,7 +68,7 @@ class BaseAppClient {
body['LanguageID'] = 2;
body['stamp'] = STAMP;
// if(!body.containsKey("IPAdress"))
// if(!body.containsKey("IPAdress"))
body['IPAdress'] = IP_ADDRESS;
body['VersionID'] = VERSION_ID;
body['Channel'] = CHANNEL;
@ -86,9 +86,6 @@ class BaseAppClient {
print("URL : $url");
print("Body : ${json.encode(body)}");
String bodyData= json.encode(body);
var asd = "";
if (await Helpers.checkConnection()) {
final response = await http.post(url,

3
lib/core/service/patient_service.dart
Unescape Escape View File

@ -130,7 +130,8 @@ class PatientService extends BaseService {
"IsLoginForDoctorApp": patient.IsLoginForDoctorApp,
"PatientOutSA": patient.PatientOutSA,
"SearchType": patient.Searchtype,
"MobileNo": ''
"MobileNo": patient.MobileNo,
"IdentificationNo": patient.IdentificationNo
},
);

9
lib/models/patient/patient_model.dart
Unescape Escape View File

@ -29,7 +29,8 @@ class PatientModel {
bool IsLoginForDoctorApp;
bool PatientOutSA;
int Searchtype;
String IdentificationNo;
String MobileNo;
int get getProjectID => ProjectID;
set setProjectID(int ProjectID) => this.ProjectID = ProjectID;
@ -132,7 +133,9 @@ class PatientModel {
this.SessionID,
this.IsLoginForDoctorApp,
this.PatientOutSA,
this.Searchtype});
this.Searchtype,
this.IdentificationNo,
this.MobileNo});
factory PatientModel.fromJson(Map<String, dynamic> json) => PatientModel(
FirstName: json["FirstName"],
@ -162,6 +165,8 @@ class PatientModel {
data['IsLoginForDoctorApp'] = this.IsLoginForDoctorApp;
data['PatientOutSA'] = this.PatientOutSA;
data['Searchtype'] = this.Searchtype;
data['IdentificationNo'] = this.IdentificationNo;
data['MobileNo'] = this.MobileNo;
return data;
}
}

8
lib/screens/medicine/search_medicine_patient_screen.dart
Unescape Escape View File

@ -72,25 +72,27 @@ class _SearchMedicinePatientScreen extends State<SearchMedicinePatientScreen>
indicatorColor: Colors.red[800],
labelColor: Theme.of(context).primaryColor,
labelPadding:
EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0),
EdgeInsets.only(top: 4.0, left: 30.0, right: 30.0),
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
width: MediaQuery.of(context).size.width * 0.30,
width: MediaQuery.of(context).size.width * 0.35,
child: Center(
child: AppText(
TranslationBase.of(context).searchPatient,
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 14,
),
),
),
Container(
width: MediaQuery.of(context).size.width * 0.30,
width: MediaQuery.of(context).size.width * 0.35,
child: Center(
child: AppText(
TranslationBase.of(context).searchMedicine,
fontWeight: FontWeight.bold,
fontSize: 14,
color: Colors.black),
),
),

15
lib/screens/patients/patient_search_screen.dart
Unescape Escape View File

@ -56,6 +56,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
MobileNo: '0',
PatientID: 0,
From: "0",
To: "0",
@ -67,6 +68,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
IdentificationNo: '0',
PatientOutSA: false);
void _validateInputs() async {
@ -192,14 +194,19 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
if (value.length == 10 &&
(value[0] == '2' || value[0] == '1')) {
_patientSearchFormValues
.PatientIdentificationID = value;
} else if (value.length == 10 &&
.IdentificationNo = value;
_patientSearchFormValues.Searchtype = 2;
_patientSearchFormValues.setPatientID = 0;
} else if ((value.length == 10 ||
value.length == 9) &&
(value[0] == '05' || value[0] == '5')) {
_patientSearchFormValues
.setPatientMobileNumber = value;
_patientSearchFormValues.MobileNo = value;
_patientSearchFormValues.Searchtype = 0;
_patientSearchFormValues.setPatientID = 0;
} else {
_patientSearchFormValues.setPatientID =
int.parse(value);
_patientSearchFormValues.Searchtype = 1;
}
}

56
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -270,7 +270,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
}
if (routeArgs != null && routeArgs.containsKey("isSearch")) {
isView = routeArgs['isView'];
patient.Searchtype = 1;
//patient.Searchtype = 1;
}
if (routeArgs != null && routeArgs.containsKey('activeFilter')) {
_activeLocation = routeArgs['activeFilter'];
@ -333,34 +333,34 @@ class _PatientsScreenState extends State<PatientsScreen> {
}
parsed = lItems;
responseModelList = new ModelResponse.fromJson(parsed).list;
//if (val2 == 7) {
responseModelList.sort((a, b) {
if (b.startTime != null && b.startTime != null) {
try {
DateTime now = DateTime.now();
DateFormat dateFormat = DateFormat("yyyy-MM-dd HH:mm");
String formattedDate =
DateFormat('yyyy-MM-dd ' + a.startTime).format(now);
DateTime dateTimeA = dateFormat.parse(formattedDate);
String formattedDateB =
DateFormat('yyyy-MM-dd ' + b.startTime).format(now);
DateTime dateTimeB = dateFormat.parse(formattedDateB);
var adate = dateTimeA; //a.startTime;
var bdate = dateTimeB;
return adate.compareTo(bdate);
} on Exception catch (_) {
print('never reached');
var adate = a.startTime; //a.startTime;
var bdate = b.startTime;
return adate.compareTo(bdate);
if (val2 == 7) {
responseModelList.sort((a, b) {
if (b.startTime != null && b.startTime != null) {
try {
DateTime now = DateTime.now();
DateFormat dateFormat = DateFormat("yyyy-MM-dd HH:mm");
String formattedDate =
DateFormat('yyyy-MM-dd ' + a.startTime).format(now);
DateTime dateTimeA = dateFormat.parse(formattedDate);
String formattedDateB =
DateFormat('yyyy-MM-dd ' + b.startTime).format(now);
DateTime dateTimeB = dateFormat.parse(formattedDateB);
var adate = dateTimeA; //a.startTime;
var bdate = dateTimeB;
return adate.compareTo(bdate);
} on Exception catch (_) {
print('never reached');
var adate = a.startTime; //a.startTime;
var bdate = b.startTime;
return adate.compareTo(bdate);
}
} else {
var adate = convertDateFormat(a.appointmentDate);
var bdate = convertDateFormat(b.appointmentDate);
return bdate.compareTo(adate);
}
} else {
var adate = convertDateFormat(a.appointmentDate);
var bdate = convertDateFormat(b.appointmentDate);
return bdate.compareTo(adate);
}
});
//}
});
}
responseModelList2 = responseModelList;
_isError = false;
} else {

162
lib/screens/prescription/add_prescription_form.dart
Unescape Escape View File

@ -1264,75 +1264,68 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
if (formKey.currentState
.validate()) {
Navigator.pop(context);
//openDrugToDrug(model);
openDrugToDrug(model);
{
// var x = model
// .patientAssessmentList
// .map((value) =>
// value.icdCode10ID)
// .toList()
// .join(',');
postProcedure(
icdCode: model
.patientAssessmentList
.isNotEmpty
? model
.patientAssessmentList[
0]
.icdCode10ID
.isEmpty
? "test"
: model
.patientAssessmentList[
0]
.icdCode10ID
.toString()
: "test",
// icdCode: model
// .patientAssessmentList
// .map((value) => value
// .icdCode10ID
// .trim())
// .toList()
// .join(' '),
dose:
strengthController
.text,
doseUnit: units[
'parameterCode']
.toString(),
patient:
widget.patient,
doseTimeIn:
doseTime['id']
.toString(),
model: widget.model,
duration:
duration['id']
.toString(),
frequency: frequency[
'parameterCode']
.toString(),
route: route[
'parameterCode']
.toString(),
drugId:
_selectedMedication
.itemId
.toString(),
strength:
strengthController
.text,
indication:
indicationController
.text,
instruction:
instructionController
.text,
doseTime:
selectedDate,
);
// postProcedure(
// icdCode: model
// .patientAssessmentList
// .isNotEmpty
// ? model
// .patientAssessmentList[
// 0]
// .icdCode10ID
// .isEmpty
// ? "test"
// : model
// .patientAssessmentList[
// 0]
// .icdCode10ID
// .toString()
// : "test",
// // icdCode: model
// // .patientAssessmentList
// // .map((value) => value
// // .icdCode10ID
// // .trim())
// // .toList()
// // .join(' '),
// dose:
// strengthController
// .text,
// doseUnit: units[
// 'parameterCode']
// .toString(),
// patient:
// widget.patient,
// doseTimeIn:
// doseTime['id']
// .toString(),
// model: widget.model,
// duration:
// duration['id']
// .toString(),
// frequency: frequency[
// 'parameterCode']
// .toString(),
// route: route[
// 'parameterCode']
// .toString(),
// drugId:
// _selectedMedication
// .itemId
// .toString(),
// strength:
// strengthController
// .text,
// indication:
// indicationController
// .text,
// instruction:
// instructionController
// .text,
// doseTime:
// selectedDate,
// );
}
}
@ -1432,7 +1425,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
context: context,
builder: (context) {
return Container(
height: SizeConfig.realScreenHeight * .5,
height: SizeConfig.realScreenHeight * .8,
width: SizeConfig.realScreenWidth,
child: SingleChildScrollView(
child: Column(
@ -1448,6 +1441,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
title: TranslationBase.of(context).addMedication,
onPressed: () {
Navigator.pop(context);
postProcedure(
icdCode: model.patientAssessmentList.isNotEmpty
? model.patientAssessmentList[0].icdCode10ID
@ -1477,6 +1471,36 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
instruction: instructionController.text,
doseTime: selectedDate,
);
// postProcedure(
// icdCode: model.patientAssessmentList.isNotEmpty
// ? model.patientAssessmentList[0].icdCode10ID
// .isEmpty
// ? "test"
// : model.patientAssessmentList[0].icdCode10ID
// .toString()
// : "test",
// // icdCode: model
// // .patientAssessmentList
// // .map((value) => value
// // .icdCode10ID
// // .trim())
// // .toList()
// // .join(' '),
// dose: strengthController.text,
// doseUnit: units['parameterCode'].toString(),
// patient: widget.patient,
// doseTimeIn: doseTime['id'].toString(),
// model: widget.model,
// duration: duration['id'].toString(),
// frequency: frequency['parameterCode'].toString(),
// route: route['parameterCode'].toString(),
// drugId: _selectedMedication.itemId.toString(),
// strength: strengthController.text,
// indication: indicationController.text,
// instruction: instructionController.text,
// doseTime: selectedDate,
// );
},
))
],

6
lib/util/helpers.dart
Unescape Escape View File

@ -423,6 +423,10 @@ class Helpers {
}
static String capitalize(str) {
return "${str[0].toUpperCase()}${str.substring(1).toLowerCase()}";
if (str != "") {
return "${str[0].toUpperCase()}${str.substring(1).toLowerCase()}";
} else {
return str;
}
}
}

7
lib/widgets/patients/PatientCard.dart
Unescape Escape View File

@ -132,11 +132,14 @@ class PatientCard extends StatelessWidget {
? patientInfo.nationalityName.trim()
: patientInfo.nationality != null
? patientInfo.nationality.trim()
: "",
: patientInfo.nationalityId != null
? patientInfo.nationalityId
: "",
fontWeight: FontWeight.bold,
fontSize: 14,
),
patientInfo.nationality != null
patientInfo.nationality != null ||
patientInfo.nationalityId != null
? ClipRRect(
borderRadius:
BorderRadius.circular(20.0),

Write Preview
Loading…
Cancel
Save