Merge branch 'master' into 'Amjad_search'

# Conflicts:
#   lib/screens/patients/patient_search_screen.dart
merge-requests/39/head
amjad nabil amireh 6 years ago
commit aafde2c311

@ -59,7 +59,7 @@ class VitalSignReqModel {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID;
data['InOutpatientType'] = this.inOutpatientType;
data['InOutPatientType'] = this.inOutpatientType;
data['TransNo'] = this.transNo;
data['LanguageID'] = this.languageID;
data['stamp'] = this.stamp;

@ -1,65 +1,65 @@
class VitalSignResModel {
int transNo;
Null projectID;
int weightKg;
int heightCm;
var transNo;
var projectID;
var weightKg;
var heightCm;
var temperatureCelcius;
int pulseBeatPerMinute;
int respirationBeatPerMinute;
int bloodPressureLower;
int bloodPressureHigher;
int sAO2;
int fIO2;
Null painScore;
var pulseBeatPerMinute;
var respirationBeatPerMinute;
var bloodPressureLower;
var bloodPressureHigher;
var sAO2;
var fIO2;
var painScore;
var bodyMassIndex;
int headCircumCm;
int leanBodyWeightLbs;
int idealBodyWeightLbs;
int temperatureCelciusMethod;
int pulseRhythm;
int respirationPattern;
Null bloodPressureCuffLocation;
Null bloodPressureCuffSize;
Null bloodPressurePatientPosition;
String painLocation;
String painDuration;
String painCharacter;
String painFrequency;
var headCircumCm;
var leanBodyWeightLbs;
var idealBodyWeightLbs;
var temperatureCelciusMethod;
var pulseRhythm;
var respirationPattern;
var bloodPressureCuffLocation;
var bloodPressureCuffSize;
var bloodPressurePatientPosition;
var painLocation;
var painDuration;
var painCharacter;
var painFrequency;
bool isPainManagementDone;
int status;
var status;
bool isVitalsRequired;
int patientID;
String createdOn;
int doctorID;
int clinicID;
Null triageCategory;
Null gCScore;
Null lineItemNo;
Null vitalSignDate;
Null actualTimeTaken;
Null sugarLevel;
Null fBS;
Null rBS;
Null observationType;
Null heartRate;
Null muscleTone;
Null reflexIrritability;
Null bodyColor;
Null isFirstAssessment;
Null dateofBirth;
Null timeOfBirth;
String bloodPressure;
String bloodPressureCuffLocationDesc;
String bloodPressureCuffSizeDesc;
String bloodPressurePatientPositionDesc;
String clinicName;
String doctorImageURL;
String doctorName;
String painScoreDesc;
String pulseRhythmDesc;
String respirationPatternDesc;
String temperatureCelciusMethodDesc;
Null time;
var patientID;
var createdOn;
var doctorID;
var clinicID;
var triageCategory;
var gCScore;
var lineItemNo;
var vitalSignDate;
var actualTimeTaken;
var sugarLevel;
var fBS;
var rBS;
var observationType;
var heartRate;
var muscleTone;
var reflexIrritability;
var bodyColor;
var isFirstAssessment;
var dateofBirth;
var timeOfBirth;
var bloodPressure;
var bloodPressureCuffLocationDesc;
var bloodPressureCuffSizeDesc;
var bloodPressurePatientPositionDesc;
var clinicName;
var doctorImageURL;
var doctorName;
var painScoreDesc;
var pulseRhythmDesc;
var respirationPatternDesc;
var temperatureCelciusMethodDesc;
var time;
VitalSignResModel(
{this.transNo,

@ -37,8 +37,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
var _patientSearchFormValues = PatientModel(
ProjectID: 15,
ClinicID: 0,
DoctorID: 4709,
ClinicID: 90,
DoctorID: 145642,
FirstName: "0",
MiddleName: "0",
LastName: "0",
@ -57,26 +57,36 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
IsLoginForDoctorApp: true,
PatientOutSA: false);
void _validateInputs() {
print("####IBRAHIM TEST#####"+_patientSearchFormValues.From);
void _validateInputs() async {
print("####IBRAHIM TEST#####" + _patientSearchFormValues.From);
// _patientSearchFormValues.TokenID =
if (_formKey.currentState.validate()) {
// If all data are correct then save data to out variables
<<<<<<< lib/screens/patients/patient_search_screen.dart
// _formKey.currentState.save();
sharedPref.getString(TOKEN).then((token) {
_patientSearchFormValues.TokenID = '@dm!n';
_patientSearchFormValues.ProjectID= 15;
_patientSearchFormValues.TokenID = _patientSearchFormValues,
_patientSearchFormValues.ProjectID= _selectedType
//"patientSearchForm": _patientSearchFormValues,
//"selectedType": _selectedType
Navigator.of(context).pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues,
"selectedType": _selectedType
});
=======
// _formKey.currentState.save();
String token = await sharedPref.getString(TOKEN);
int projectID = await sharedPref.getInt(PROJECT_ID);
_patientSearchFormValues.TokenID = token;
_patientSearchFormValues.ProjectID = projectID;
// print(_patientSearchFormValues.PatientMobileNumber+"dfdfdfddf");
Navigator.of(context).pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues,
"selectedType": _selectedType
>>>>>>> lib/screens/patients/patient_search_screen.dart
});
} else {
// If all data are not valid then start auto validation.
@ -180,8 +190,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// validator: (value) {
// return TextValidator().validateName(value);
// },
inputFormatter: ONLY_LETTERS
),
inputFormatter: ONLY_LETTERS),
SizedBox(
height: 10,
),
@ -193,8 +202,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// validator: (value) {
// return TextValidator().validateName(value);
// },
inputFormatter: ONLY_LETTERS
),
inputFormatter: ONLY_LETTERS),
SizedBox(
height: 10,
),
@ -206,8 +214,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// validator: (value) {
// return TextValidator().validateName(value);
// },
inputFormatter: ONLY_LETTERS
),
inputFormatter: ONLY_LETTERS),
SizedBox(
height: 10,
),

@ -39,22 +39,20 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
*@return:
*@desc: getVitalSignList Function
*/
getVitalSignList(context) {
getVitalSignList(context) async {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
sharedPref.getString(TOKEN).then((token) {
String token = await sharedPref.getString(TOKEN);
VitalSignReqModel vitalSignReqModel = VitalSignReqModel(
patientID: 1237159, //patient.patientId,
projectID: 12, //patient.projectId,
tokenID: '@dm!n',
patientID: patient.patientId,
projectID: patient.projectId,
tokenID: token,
patientTypeID: patient.patientType,
inOutpatientType: 2,
inOutpatientType: 1,
languageID: 2,
transNo: 0,
);
//patient.admissionNo != null ? int.parse(patient.admissionNo) : 0);
transNo:
patient.admissionNo != null ? int.parse(patient.admissionNo) : 0);
patientsProv.getPatientVitalSign(vitalSignReqModel.toJson());
});
}
@override
@ -71,6 +69,8 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
Widget build(BuildContext context) {
return AppScaffold(
appBarTitle: "VITAL SIGN",
showAppDrawer: false,
showBottomBar: false,
body: patientsProv.isLoading
? DrAppCircularProgressIndeicator()
: patientsProv.isError
@ -88,29 +88,58 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
),
)
: Container(
margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05,
0,
SizeConfig.realScreenWidth * 0.05,
0),
child: ListView.builder(
itemCount: patientsProv.patientVitalSignList.length,
itemBuilder: (BuildContext ctxt, int index) {
return InkWell(
child: CardWithBgWidget(
widget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
CircleAvatar(
radius:
SizeConfig.imageSizeMultiplier *
12,
backgroundImage: NetworkImage(
patientsProv
.patientVitalSignList[index]
.doctorImageURL),
backgroundColor: Colors.transparent,
),
Padding(
padding: const EdgeInsets.fromLTRB(8,0,0,0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
'DoctorName - ${patientsProv.patientVitalSignList[index].doctorName}',
fontSize: 2.5 * SizeConfig.textMultiplier,
'${patientsProv.patientVitalSignList[index].doctorName}',
fontSize: 2.5 *
SizeConfig.textMultiplier,
),
SizedBox(
height: 8,
),
AppText('painScoreDesc - ${patientsProv.patientVitalSignList[index].painScoreDesc}',
fontSize:
2.5 * SizeConfig.textMultiplier),
AppText(
' ${patientsProv.patientVitalSignList[index].clinicName}',
fontSize: 2.5 *
SizeConfig.textMultiplier),
SizedBox(
height: 8,
),
],
),
)
],
),
],
),
),
onTap: () {},
);

@ -99,7 +99,7 @@ class _LoginFormState extends State<LoginForm> {
controller: projectIdController,
onTap: () {
helpers.showCupertinoPicker(
context, projectsList, 'Desciption', onSelectProject);
context, projectsList, 'Name', onSelectProject);
},
showCursor: false,
readOnly: true,

Loading…
Cancel
Save