Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!529
merge-requests/530/merge
Mohammad Aljammal 5 years ago
commit a95bb8be04

@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart'; import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
@ -61,30 +62,11 @@ class _HomeScreenState extends State<HomeScreen> {
var _isInit = true; var _isInit = true;
DoctorProfileModel profile; DoctorProfileModel profile;
bool isExpanded = false; bool isExpanded = false;
String isInpatient = ""; bool isInpatient = false;
var clinicName = []; var clinicName = [];
int sliderActiveIndex = 0; int sliderActiveIndex = 0;
var clinicId; var clinicId;
var _patientSearchFormValues = PatientModel( var _patientSearchFormValues;
FirstName: "0",
MiddleName: "0",
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
void didChangeDependencies() async { void didChangeDependencies() async {
super.didChangeDependencies(); super.didChangeDependencies();
@ -338,17 +320,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: scrollDirection:
Axis.horizontal, Axis.horizontal,
@ -381,17 +353,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: Axis scrollDirection: Axis
.horizontal, .horizontal,
@ -427,17 +389,7 @@ class _HomeScreenState extends State<HomeScreen> {
], ],
), ),
new Container( new Container(
height: MediaQuery.of(context) height: 130,
.orientation ==
Orientation.portrait
? MediaQuery.of(context)
.size
.height *
0.15
: MediaQuery.of(context)
.size
.height *
0.20,
child: new ListView( child: new ListView(
scrollDirection: Axis scrollDirection: Axis
.horizontal, .horizontal,
@ -573,6 +525,7 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
getRequestHeader(false);
Navigator.of(context) Navigator.of(context)
.pushNamed(PATIENTS, arguments: { .pushNamed(PATIENTS, arguments: {
"patientSearchForm": "patientSearchForm":
@ -622,6 +575,46 @@ class _HomeScreenState extends State<HomeScreen> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Row(
children: [
HomePageCard(
color: Colors.black,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
top: 10, left: 10, right: 0),
child: Icon(
DoctorApp.search,
size: 32,
color: Colors.white,
)),
Container(
padding: EdgeInsets.all(10),
child: AppText(
TranslationBase.of(context).inPatient,
color: Colors.white,
textAlign: TextAlign.start,
fontSize: 13,
))
],
),
hasBorder: false,
onTap: () {
getRequestHeader(true);
Navigator.of(context)
.pushNamed(PATIENTS, arguments: {
"patientSearchForm":
_patientSearchFormValues,
"selectedType": "1",
"arrivalType": "1"
});
},
)
],
),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
@ -832,4 +825,31 @@ class _HomeScreenState extends State<HomeScreen> {
])), ])),
]; ];
} }
getRequestHeader(isInpatient) {
_patientSearchFormValues = PatientModel(
FirstName: "0",
MiddleName: "0",
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
From: isInpatient == true
? '0'
: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: isInpatient == true
? '0'
: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
}
} }

@ -593,6 +593,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: TranslationBase.of(context).search, title: TranslationBase.of(context).search,
color: Colors.red[800],
onPressed: () { onPressed: () {
_validateInputs(); _validateInputs();
}, },

@ -22,7 +22,7 @@ class GetActivityButton extends StatelessWidget {
Padding( Padding(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText(value.value.toString(), child: AppText(value.value.toString(),
fontSize: 28, fontWeight: FontWeight.bold)), fontSize: 32, fontWeight: FontWeight.bold)),
Expanded( Expanded(
child: AppText( child: AppText(
value.kPIParameter, value.kPIParameter,

@ -136,6 +136,7 @@ class PatientCard extends StatelessWidget {
: "", : "",
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14, fontSize: 14,
textOverflow: TextOverflow.ellipsis,
), ),
patientInfo.nationality != null || patientInfo.nationality != null ||
patientInfo.nationalityId != null patientInfo.nationalityId != null
@ -143,7 +144,9 @@ class PatientCard extends StatelessWidget {
borderRadius: borderRadius:
BorderRadius.circular(20.0), BorderRadius.circular(20.0),
child: Image.network( child: Image.network(
patientInfo.nationalityFlagURL, patientInfo.nationalityFlagURL != null
? patientInfo.nationalityFlagURL
: '',
height: 25, height: 25,
width: 30, width: 30,
errorBuilder: (BuildContext context, errorBuilder: (BuildContext context,

Loading…
Cancel
Save