fix new design issue

merge-requests/626/head
Elham Rababah 5 years ago
parent ee4d7b785b
commit d5d57e7997

@ -322,4 +322,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.1 COCOAPODS: 1.10.0.rc.1

@ -336,7 +336,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '9.9.9.9'; const IP_ADDRESS = '9.9.9.9';
const VERSION_ID = 5.8; const VERSION_ID = 5.9;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -847,7 +847,7 @@ const Map<String, Map<String, String>> localizedValues = {
"en": "Apply Reschedule Leave", "en": "Apply Reschedule Leave",
"ar": "التقدم بطلب أو إعادة جدولة الإجازة" "ar": "التقدم بطلب أو إعادة جدولة الإجازة"
}, },
"myQRCode": {"en": "My QR Code", "ar": "My QR Code"}, "myQRCode": {"en": "My QR Code", "ar": " كود QR "},
"patientIDMobilenational": { "patientIDMobilenational": {
"en": "Patient ID, National ID, Mobile Number", "en": "Patient ID, National ID, Mobile Number",
"ar": "هوية المريض ، الهوية الوطنية ، رقم الهاتف المحمول" "ar": "هوية المريض ، الهوية الوطنية ، رقم الهاتف المحمول"

@ -90,7 +90,7 @@ class _LandingPageState extends State<LandingPage> {
case 2: case 2:
return TranslationBase.of(context).qr; return TranslationBase.of(context).qr;
case 3: case 3:
return TranslationBase.of(context).replay; return TranslationBase.of(context).replay2;
} }
} }
} }

@ -34,7 +34,7 @@ class DoctorReplyScreen extends StatelessWidget {
}, },
child: AppScaffold( child: AppScaffold(
baseViewModel: model, baseViewModel: model,
appBarTitle: TranslationBase.of(context).replay2, appBarTitle: "ghgh",//TranslationBase.of(context).replay2,
isShowAppBar: false, isShowAppBar: false,
body: model.listDoctorWorkingHoursTable.isEmpty body: model.listDoctorWorkingHoursTable.isEmpty
? DrAppEmbeddedError(error: TranslationBase.of(context).noItem) ? DrAppEmbeddedError(error: TranslationBase.of(context).noItem)

@ -109,7 +109,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
baseViewModel: model, baseViewModel: model,
body: Column( body: Column(
children: [ children: [
Container( Container(
// color: Colors.red, // color: Colors.red,
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
decoration: TextFieldsUtils decoration: TextFieldsUtils
@ -155,11 +155,40 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
borderRadius: 4, borderRadius: 4,
borderWidth: 0), borderWidth: 0),
child: Center( child: Center(
child: AppText( child: Row(
item, mainAxisAlignment: MainAxisAlignment.center,
fontSize: SizeConfig.textMultiplier * 1.8, children: [
color: _isActive ? Colors.white : Color(0xFF2B353E), AppText(
fontWeight: FontWeight.w700, item,
fontSize: SizeConfig.textMultiplier * 1.8,
color: _isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
_isActive&&_activeLocation!=0 ?Container(
padding: EdgeInsets.all(2),
margin: EdgeInsets.symmetric(horizontal: 5),
decoration:
new BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(
50),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
model.filterData.length.toString(),
style: new TextStyle(
color: Colors.red,
fontSize: 10
),
textAlign:
TextAlign.center,
),
):Container(),
],
), ),
), ),
), ),
@ -169,7 +198,6 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
}).toList(), }).toList(),
), ),
), ),
SizedBox(height: 18.5), SizedBox(height: 18.5),
Container( Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,

@ -351,6 +351,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
hintText: TranslationBase.of(context).remarks, hintText: TranslationBase.of(context).remarks,
maxLines: 18, maxLines: 18,
minLines: 5, minLines: 5,
inputType: TextInputType.multiline,
controller: remarkController, controller: remarkController,
onChanged: (value) { onChanged: (value) {
widget.mySelectedAssessment.remark = widget.mySelectedAssessment.remark =

@ -40,22 +40,28 @@ class UpdateChiefComplaints extends StatelessWidget {
maxLines: 25, maxLines: 25,
minLines: 7, minLines: 7,
hasBorder: true, hasBorder: true,
validationError:complaintsControllerError !=''?complaintsControllerError:null , inputType: TextInputType.multiline,
validationError: complaintsControllerError != ''
? complaintsControllerError
: null,
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: TranslationBase hintText: TranslationBase
.of(context) .of(context)
.historyOfPresentIllness, .historyOfPresentIllness,
controller: illnessController, controller: illnessController,
maxLines: 25, inputType: TextInputType.multiline,
minLines: 7,
maxLines: 25,
minLines: 7,
hasBorder: true, hasBorder: true,
validationError:illnessControllerError !=''?illnessControllerError:null , validationError: illnessControllerError != ''
? illnessControllerError
: null,
), ),
SizedBox( SizedBox(
height: 10, height: 10,
@ -67,14 +73,18 @@ class UpdateChiefComplaints extends StatelessWidget {
height: 10, height: 10,
), ),
AppTextFieldCustom( AppTextFieldCustom(
hintText: TranslationBase hintText: TranslationBase
.of(context) .of(context)
.currentMedications, .currentMedications,
controller: medicationController, controller: medicationController,
maxLines: 25, maxLines: 25,
minLines: 7, minLines: 7,
hasBorder: true, hasBorder: true,
validationError:medicationControllerError !=''?medicationControllerError:null , inputType: TextInputType.multiline,
validationError: medicationControllerError != ''
? medicationControllerError
: null,
), ),
SizedBox( SizedBox(

@ -16,9 +16,6 @@ import 'app_texts_widget.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
// OWNER : Ibrahim albitar
// DATE : 06-04-2020
// DESCRIPTION : Custom App Drawer for app.
class AppDrawer extends StatefulWidget { class AppDrawer extends StatefulWidget {
@override @override
@ -26,7 +23,6 @@ class AppDrawer extends StatefulWidget {
} }
class _AppDrawerState extends State<AppDrawer> { class _AppDrawerState extends State<AppDrawer> {
bool _isInit = true;
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
ProjectViewModel projectsProvider; ProjectViewModel projectsProvider;

@ -5,10 +5,6 @@ import 'package:flutter/material.dart';
import '../shared/app_texts_widget.dart'; import '../shared/app_texts_widget.dart';
// OWNER : Ibrahim albitar
// DATE : 08-04-2020
// DESCRIPTION : Custom Drawer item for app.
class DrawerItem extends StatefulWidget { class DrawerItem extends StatefulWidget {
final String title; final String title;
final String subTitle; final String subTitle;

Loading…
Cancel
Save