Merge branch 'qassim-MOH-demo-' of http://34.17.182.140/Haroon6138/doctor_app_flutter into qassim-MOH-demo-

main^2
Sultan Khan 2 months ago
commit 4d91c67579

@ -45,7 +45,7 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
tools:replace="android:name"
android:label="HMG Doctor">
android:label="Qasim hospital cluster">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 311 KiB

@ -1,128 +1,122 @@
{
"images":[
{
"idiom":"iphone",
"size":"20x20",
"scale":"2x",
"filename":"Icon-App-20x20@2x.png"
},
{
"idiom":"iphone",
"size":"20x20",
"scale":"3x",
"filename":"Icon-App-20x20@3x.png"
},
{
"idiom":"iphone",
"size":"29x29",
"scale":"1x",
"filename":"Icon-App-29x29@1x.png"
},
{
"idiom":"iphone",
"size":"29x29",
"scale":"2x",
"filename":"Icon-App-29x29@2x.png"
},
{
"idiom":"iphone",
"size":"29x29",
"scale":"3x",
"filename":"Icon-App-29x29@3x.png"
},
{
"idiom":"iphone",
"size":"40x40",
"scale":"2x",
"filename":"Icon-App-40x40@2x.png"
},
{
"idiom":"iphone",
"size":"40x40",
"scale":"3x",
"filename":"Icon-App-40x40@3x.png"
},
{
"idiom":"iphone",
"size":"60x60",
"scale":"2x",
"filename":"Icon-App-60x60@2x.png"
},
{
"idiom":"iphone",
"size":"60x60",
"scale":"3x",
"filename":"Icon-App-60x60@3x.png"
},
{
"idiom":"iphone",
"size":"76x76",
"scale":"2x",
"filename":"Icon-App-76x76@2x.png"
},
{
"idiom":"ipad",
"size":"20x20",
"scale":"1x",
"filename":"Icon-App-20x20@1x.png"
},
{
"idiom":"ipad",
"size":"20x20",
"scale":"2x",
"filename":"Icon-App-20x20@2x.png"
},
{
"idiom":"ipad",
"size":"29x29",
"scale":"1x",
"filename":"Icon-App-29x29@1x.png"
},
{
"idiom":"ipad",
"size":"29x29",
"scale":"2x",
"filename":"Icon-App-29x29@2x.png"
},
{
"idiom":"ipad",
"size":"40x40",
"scale":"1x",
"filename":"Icon-App-40x40@1x.png"
},
{
"idiom":"ipad",
"size":"40x40",
"scale":"2x",
"filename":"Icon-App-40x40@2x.png"
},
{
"idiom":"ipad",
"size":"76x76",
"scale":"1x",
"filename":"Icon-App-76x76@1x.png"
},
{
"idiom":"ipad",
"size":"76x76",
"scale":"2x",
"filename":"Icon-App-76x76@2x.png"
},
{
"idiom":"ipad",
"size":"83.5x83.5",
"scale":"2x",
"filename":"Icon-App-83.5x83.5@2x.png"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"scale" : "1x",
"filename" : "ItunesArtwork@2x.png"
}
],
"info":{
"version":1,
"author":"easyappicon"
"images" : [
{
"filename" : "Icon-40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "Icon-29 1.png",
"idiom" : "iphone",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "Icon-58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "Icon-80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "Icon-120 1.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "Icon-180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "Icon-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "Icon-40 1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "Icon-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "Icon-58 1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "Icon-40 2.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "Icon-80 1.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "Icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "Icon-152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "Icon-167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "Icon-1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 998 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

@ -11,9 +11,9 @@ const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'http://10.20.200.111:1010/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://webservices.hmg.com/';
//
@ -430,8 +430,8 @@ const TIMER_MIN = 10;
class AppGlobal {
static var CONTEX;
static Color appRedColor = Color(0xFFD02127);
static Color appGreenColor = Color(0xFF359846);
static Color appRedColor = Color(0xFF1E8CC8);
static Color appGreenColor = Color(0xFF1E8CC8);
static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A);
static Color inProgressColor = Color(0xFFCC9B14);

@ -166,7 +166,7 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "الرجاء ادخال مستشفى"
},
"login": {"en": "Login", "ar": "تسجيل دخول"},
"drSulaimanAlHabib": {"en": "Dr Sulaiman Al Habib", "ar": "د.سليمان الحبيب"},
"ministryOfHealth": {"en": "Ministry of Health", "ar": "وزارة الصحة"},
"welcomeTo": {"en": "Welcome to", "ar": "مرحبا بك"},
"welcomeBackTo": {"en": "Welcome Back to", "ar": "مرحبًا بعودتك الى "},
"home": {"en": "Home", "ar": "الرئيسية"},

@ -81,11 +81,11 @@ class _LandingPageState extends State<LandingPage> {
HomeScreen(),
MyScheduleScreen(),
QrReaderScreen(),
DoctorReplyScreen(
changeCurrentTab: () {
_changeCurrentTab(0);
},
),
// DoctorReplyScreen(
// changeCurrentTab: () {
// _changeCurrentTab(0);
// },
// ),
],
),
bottomNavigationBar: BottomNavBar(

@ -74,12 +74,12 @@ class _LoginScreenState extends State<LoginScreen> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, fontFamily: 'Poppins'),
),
Text(
TranslationBase.of(context).drSulaimanAlHabib,
TranslationBase.of(context).ministryOfHealth,
style: TextStyle(color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth! * 0.029, fontFamily: 'Poppins'),
),
Text(
"Doctor App",
style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFFD02127)),
style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFF1E8CC8)),
),
]),
],

@ -302,20 +302,19 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: VerificationMethodsList(
VerificationMethodsList(
authenticationViewModel: authenticationViewModel,
authMethodType: AuthMethodTypes.SMS,
authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive),
onShowMore: () {},
)),
Expanded(
child: VerificationMethodsList(
authenticationViewModel: authenticationViewModel,
authMethodType: AuthMethodTypes.WhatsApp,
authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive),
onShowMore: () {},
))
),
// Expanded(
// child: VerificationMethodsList(
// authenticationViewModel: authenticationViewModel,
// authMethodType: AuthMethodTypes.WhatsApp,
// authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive),
// onShowMore: () {},
// ))
],
),
]),

@ -368,59 +368,59 @@ class _HomeScreenState extends State<HomeScreen> {
List<HomePatientCard> patientCards = [];
if (model.hasVirtualClinic) {
patientCards.add(HomePatientCard(
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.livecare,
textColor: textColors[colorIndex],
iconSize: 21,
text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}",
onTap: () {
// TODO MOSA TEST
// PatiantInformtion patient = PatiantInformtion(
// patientStatusType: 43,
// episodeNo: 0,
// vcId: 42342,
// fullName: "mosa test",
// dateofBirth: "2000-05-01 10:42:35.790004"
// );
// Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {
// "patient": patient,
// "patientType": "0",
// "isSearch": false,
// "isInpatient": false,
// "arrivalType": "0",
// "isSearchAndOut": false,
// "isFromLiveCare": true,
// });
Navigator.push(
context,
FadePage(
page: LiveCarePatientScreen(),
),
);
},
));
changeColorIndex();
}
// if (model.hasVirtualClinic) {
// patientCards.add(HomePatientCard(
// gradient: backgroundColors[colorIndex],
// backgroundIconColor: backgroundIconColors[colorIndex],
// cardIcon: DoctorApp.livecare,
// textColor: textColors[colorIndex],
// iconSize: 21,
// text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}",
// onTap: () {
// // TODO MOSA TEST
// // PatiantInformtion patient = PatiantInformtion(
// // patientStatusType: 43,
// // episodeNo: 0,
// // vcId: 42342,
// // fullName: "mosa test",
// // dateofBirth: "2000-05-01 10:42:35.790004"
// // );
// // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {
// // "patient": patient,
// // "patientType": "0",
// // "isSearch": false,
// // "isInpatient": false,
// // "arrivalType": "0",
// // "isSearchAndOut": false,
// // "isFromLiveCare": true,
// // });
// Navigator.push(
// context,
// FadePage(
// page: LiveCarePatientScreen(),
// ),
// );
// },
// ));
// changeColorIndex();
// }
patientCards.add(HomePatientCard(
gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.qr_reader,
textColor: textColors[colorIndex],
text: "ER sign In",
onTap: () {
Navigator.push(
context,
FadePage(
page: ErSignInScreen(),
),
);
},
));
changeColorIndex();
// patientCards.add(HomePatientCard(
// gradient: backgroundColors[colorIndex],
// backgroundIconColor: backgroundIconColors[colorIndex],
// cardIcon: DoctorApp.qr_reader,
// textColor: textColors[colorIndex],
// text: "ER sign In",
// onTap: () {
// Navigator.push(
// context,
// FadePage(
// page: ErSignInScreen(),
// ),
// );
// },
// ));
// changeColorIndex();
if (model.doctorProfile != null) {
patientCards.add(

@ -72,7 +72,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.patientSearchViewModel!.resetFilters();
});
},
activeColor: Colors.red,
activeColor: Color(0xFF1E8CC8),
),
AppText(
"${TranslationBase.of(context).allClinic}",
@ -103,7 +103,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.onChangeValue!(isAllClinic: false, showBottomSheet: true, selectedClinicName: widget.selectedClinicName);
}
},
activeColor: Colors.red,
activeColor: Color(0xFF1E8CC8),
),
AppText(
widget.selectedClinicName ?? TranslationBase.of(context).clinicSelect,
@ -247,7 +247,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.patientSearchViewModel!.filterByClinic(clinicName: value!);
});
},
activeColor: Colors.red,
activeColor: Color(0xFF1E8CC8),
),
AppText(
widget.patientSearchViewModel!.InpatientClinicList[index],

@ -43,14 +43,14 @@ class ProfileGridForInPatient extends StatelessWidget {
isVidaPlusProject: isVidaPlusProject
),
PatientProfileCardModel(
TranslationBase.of(context).lab,
TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT,
'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
// PatientProfileCardModel(
// TranslationBase.of(context).lab,
// TranslationBase.of(context).special,
// ALL_SPECIAL_LAB_RESULT,
// 'assets/images/svgs/profile_screen/lab results.svg',
// isInPatient: isInpatient,
// isVidaPlusProject: isVidaPlusProject
// ),
PatientProfileCardModel(
TranslationBase.of(context).radiology,
TranslationBase.of(context).result,
@ -59,14 +59,14 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
PatientProfileCardModel(
TranslationBase.of(context).patient,
TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
// PatientProfileCardModel(
// TranslationBase.of(context).patient,
// TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
// ORDER_PRESCRIPTION_OLD,
// 'assets/images/svgs/profile_screen/order prescription.svg',
// isInPatient: isInpatient,
// isVidaPlusProject: isVidaPlusProject
// ),
PatientProfileCardModel(
TranslationBase.of(context).patient,
TranslationBase.of(context).prescription,
@ -145,15 +145,15 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
PatientProfileCardModel(
TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave,
ADD_SICKLEAVE,
'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient,
//onTap: () {},
isVidaPlusProject: isVidaPlusProject
),
// PatientProfileCardModel(
// TranslationBase.of(context).patientSick,
// TranslationBase.of(context).leave,
// ADD_SICKLEAVE,
// 'assets/images/svgs/profile_screen/patient sick leave.svg',
// isInPatient: isInpatient,
// //onTap: () {},
// isVidaPlusProject: isVidaPlusProject
// ),
PatientProfileCardModel(
TranslationBase.of(context).operation,
TranslationBase.of(context).report,
@ -194,22 +194,22 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
PatientProfileCardModel(
TranslationBase.of(context).diabetic,
TranslationBase.of(context).chart,
DIABETIC_CHART_VALUES,
'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
PatientProfileCardModel(
"VTE",
"Assessment",
VTE_ASSESSMENT,
'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject
),
// PatientProfileCardModel(
// TranslationBase.of(context).diabetic,
// TranslationBase.of(context).chart,
// DIABETIC_CHART_VALUES,
// 'assets/images/svgs/profile_screen/diabetic chart.svg',
// isInPatient: isInpatient,
// isVidaPlusProject: isVidaPlusProject
// ),
// PatientProfileCardModel(
// "VTE",
// "Assessment",
// VTE_ASSESSMENT,
// 'assets/images/svgs/profile_screen/diabetic chart.svg',
// isInPatient: isInpatient,
// isVidaPlusProject: isVidaPlusProject
// ),
PatientProfileCardModel(
TranslationBase.of(context).pharmacy,
TranslationBase.of(context).intervention,

@ -27,50 +27,60 @@ class ProfileGridForOther extends StatelessWidget {
@override
Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase
.of(context)
.vital, TranslationBase
.of(context)
.signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase
.of(context)
.lab, TranslationBase
.of(context)
.result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).prescription, ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase
.of(context)
.patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg',
isInPatient: isInpatient),
isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, 'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
isInPatient: isInpatient,),
if ( (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,),
if ( (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,),
if ((patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient,
isDisable:
Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null),
Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null,),
];
return Padding(
padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15),
padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15,),
child: GridView(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
physics: BouncingScrollPhysics(),
// if you want IOS bouncing effect, otherwise remove this line
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisSpacing: 10,
mainAxisSpacing: 8,
crossAxisCount: 3,
),
),
//change the number as you want
children: cardsList.map((item) {
return PatientProfileButton(
@ -90,7 +100,7 @@ class ProfileGridForOther extends StatelessWidget {
isLoading: item.isLoading,
);
}).toList(),
),
),
);
}
}

@ -36,14 +36,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient,
//onTap: () {},
),
PatientProfileCardModel(
TranslationBase.of(context).lab,
TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT,
'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient,
//onTap: () {},
),
// PatientProfileCardModel(
// TranslationBase.of(context).lab,
// TranslationBase.of(context).special,
// ALL_SPECIAL_LAB_RESULT,
// 'assets/images/svgs/profile_screen/lab results.svg',
// isInPatient: isInpatient,
// //onTap: () {},
// ),
PatientProfileCardModel(
TranslationBase.of(context).radiology,
TranslationBase.of(context).service,
@ -52,14 +52,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient,
//onTap: () {},
),
PatientProfileCardModel(
TranslationBase.of(context).orders,
TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient,
//onTap: () {},
),
// PatientProfileCardModel(
// TranslationBase.of(context).orders,
// TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
// ORDER_PRESCRIPTION_OLD,
// 'assets/images/svgs/profile_screen/order prescription.svg',
// isInPatient: isInpatient,
// //onTap: () {},
// ),
PatientProfileCardModel(
TranslationBase.of(context).patient,
TranslationBase.of(context).prescription,
@ -100,14 +100,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient,
//onTap: () {},
),
PatientProfileCardModel(
TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave,
ADD_SICKLEAVE,
'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient,
//onTap: () {},
),
// PatientProfileCardModel(
// TranslationBase.of(context).patientSick,
// TranslationBase.of(context).leave,
// ADD_SICKLEAVE,
// 'assets/images/svgs/profile_screen/patient sick leave.svg',
// isInPatient: isInpatient,
// //onTap: () {},
// ),
if (patient!.appointmentNo != null && patient!.appointmentNo != 0)
PatientProfileCardModel(
TranslationBase.of(context).patient,

@ -415,7 +415,7 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
child: AppButton(
title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600,
color: Color(0xFF359846),
color: Color(0xFF1E8CC8),
onPressed: () async {
selectedDiagnosisItem ??=
model.diagnosisTypeList.keys.first;

@ -381,7 +381,7 @@ class _EnterDiagnosisState extends State<EnterDiagnosis> {
child: AppButton(
title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600,
color: Color(0xFF359846),
color: Color(0xFF1E8CC8),
onPressed: () async {
selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first;
selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem];

@ -451,7 +451,7 @@ class _FavoriteDiagnosisState extends State<FavoriteDiagnosis> {
child: AppButton(
title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600,
color: Color(0xFF359846),
color: Color(0xFF1E8CC8),
onPressed: () async {
selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first;
selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem];

@ -112,7 +112,7 @@ class _AddDetailsToExaminationVidaPlusState
Expanded(
child: AppButton(
title: TranslationBase.of(context).saveSmall,
color: Color(0xff359846),
color: Color(0xFF1E8CC8),
fontColor: Colors.white,
fontWeight: FontWeight.w600,
onPressed: () async {

@ -325,7 +325,7 @@ class _AddProgressNoteState extends State<AddProgressNote> {
Expanded(
child: AppButton(
title: TranslationBase.of(context).save,
color: Color(0xff359846),
color: Color(0xFF1E8CC8),
fontColor: Colors.white,
fontWeight: FontWeight.w600,
onPressed: () async {

@ -470,7 +470,7 @@ class _ReactionsSelectionAllergiesWidgetState
))
// CustomBottomSheetContainer(
// buttonColor: Color(0xff359846),
// buttonColor: Color(0xFF1E8CC8),
// fontColor: Colors.white,
// label: TranslationBase.of(context).next,
// onTap: () {

@ -201,7 +201,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidgetVidaPlus> {
label: AppText(
TranslationBase.of(context).resolve,
fontSize: 12,
color: Color(0xff359846)))
color: Color(0xFF1E8CC8)))
],
)
: selectedAllergy.allergyID! != 0
@ -253,7 +253,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidgetVidaPlus> {
Color getColor(int severity) {
Map<int, dynamic> color = {
1: Color(0xff359846),
1: Color(0xFF1E8CC8),
2: Color(0xFFCC9B14),
3: Color(0xffD02127)
};

@ -78,7 +78,7 @@ class SoapDetailItem extends StatelessWidget {
),
AppText(
type ?? '',
color: Color(0xff359846),
color: Color(0xFF1E8CC8),
fontSize: 10,
fontWeight: FontWeight.w500,
),
@ -131,7 +131,7 @@ class SoapDetailItem extends StatelessWidget {
onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE),
child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/resolve.svg',
fontColor: Color(0XFF359846),
fontColor: Color(0xFF1E8CC8),
text: TranslationBase.of(context).resolve,
),
),
@ -203,7 +203,7 @@ class Status extends StatelessWidget {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(3),
),
// color: Color(0xFF359846),
// color: Color(0xFF1E8CC8),
color: (status.toLowerCase() ==
TranslationBase.of(context).active.toLowerCase() ||
status.toLowerCase() ==
@ -221,7 +221,7 @@ class Status extends StatelessWidget {
TranslationBase.of(context).active.toLowerCase() ||
status.toLowerCase() ==
TranslationBase.of(context).stable.toLowerCase())
? Color(0xFF359846)
? Color(0xFF1E8CC8)
: Colors.white,
fontSize: 8,
fontWeight: FontWeight.w600,

@ -562,7 +562,7 @@ getIcdCodeData() async{
alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
color: Color(0xff359846),
color: Color(0xFF1E8CC8),
title: TranslationBase.of(context).addMedication,
fontWeight: FontWeight.w600,
onPressed: () async {

@ -335,8 +335,8 @@ class TranslationBase {
String get login => localizedValues['login']![locale.languageCode]!;
String get drSulaimanAlHabib =>
localizedValues['drSulaimanAlHabib']![locale.languageCode]!;
String get ministryOfHealth =>
localizedValues['ministryOfHealth']![locale.languageCode]!;
String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!;

@ -13,7 +13,7 @@ class CustomBottomSheetContainer extends StatelessWidget {
final double? widthFactor;
double headerHeight = SizeConfig.heightMultiplier! * 12;
CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key);
CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF1E8CC8) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key);
@override
Widget build(BuildContext context) {

@ -127,22 +127,22 @@ class _AppDrawerState extends State<AppDrawer> {
},
),
SizedBox(height: 15),
InkWell(
child: DrawerItem(
TranslationBase.of(context).doctorRota,
icon: Icons.punch_clock,
// subTitle: ,
),
onTap: () {
Navigator.pop(context);
Navigator.push(
context,
MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule')
// MyReferredPatient(),
));
},
),
// InkWell(
// child: DrawerItem(
// TranslationBase.of(context).doctorRota,
// icon: Icons.punch_clock,
//
// // subTitle: ,
// ),
// onTap: () {
// Navigator.pop(context);
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule')
// // MyReferredPatient(),
// ));
// },
// ),
SizedBox(height: 15),
InkWell(
child: DrawerItem(

@ -80,16 +80,16 @@ class _BottomNavBarState extends State<BottomNavBar> {
name: TranslationBase.of(context).qr,
dashboardViewModel: widget.dashboardViewModel,
),
BottomNavigationItem(
icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1,
svgPath: "assets/images/svgs/bottom_nav/reply-active.svg",
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 3,
name: TranslationBase.of(context).replay2,
dashboardViewModel: widget.dashboardViewModel,
),
// BottomNavigationItem(
// icon: DoctorApp.dr_reply_1,
// activeIcon: DoctorApp.dr_reply_active_1,
// svgPath: "assets/images/svgs/bottom_nav/reply-active.svg",
// changeIndex: _changeIndex,
// index: widget.index,
// currentIndex: 3,
// name: TranslationBase.of(context).replay2,
// dashboardViewModel: widget.dashboardViewModel,
// ),
],
),
),

@ -75,7 +75,7 @@ class _AppButtonState extends State<AppButton> {
? Colors.grey
: widget.color != null
? widget.color
: HexColor("#D02127"),
: Color(0xFF1E8CC8),
splashColor: widget.color,
child: Padding(
padding: (widget.hPadding > 0 || widget.vPadding > 0)
@ -133,7 +133,7 @@ class _AppButtonState extends State<AppButton> {
? widget.borderColor
: widget.disabled
? Colors.grey
: widget.color ?? Color(0xFFB8382C),
: widget.color ?? Color(0xFF1E8CC8),
width: 0.8,
),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))),

@ -111,7 +111,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
Color(0Xffffffff),
widget.validationError == null
? Color(0xFFEFEFEF)
: Colors.red.shade700,
: Color(0xFF1E8CC8),
)
: null,
padding:

@ -1073,10 +1073,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.17.0"
version: "1.16.0"
mime:
dependency: transitive
description:
@ -1598,10 +1598,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev"
source: hosted
version: "0.7.7"
version: "0.7.6"
timezone:
dependency: "direct main"
description:

Loading…
Cancel
Save