Merge branch 'v2.8_roaa' into 'dev_v2.8'

V2.8 roaa

See merge request Cloud_Solution/doctor_app_flutter!932
merge-requests/934/merge
Elham Ali 4 years ago
commit 4779d29010

@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 30 compileSdkVersion 31
// signingConfigs { // signingConfigs {
// release { // release {

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.5.20'
repositories { repositories {
google() google()
jcenter() jcenter()

@ -59,6 +59,8 @@ class PharmaciesItemsRequestModel {
data['SessionID'] = this.sessionID; data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID; data['DeviceTypeID'] = this.deviceTypeID;
///todo Elham* we need to talk to the backend
data['VersionID'] = "30";
return data; return data;
} }
} }

@ -187,7 +187,9 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
height: 10, height: 10,
), ),
if (myController.text != '') if (myController.text != '')
Container( FractionallySizedBox(
widthFactor: 0.9,
child: Container(
height: MediaQuery.of(context).size.height * 0.6, height: MediaQuery.of(context).size.height * 0.6,
child: ListView.builder( child: ListView.builder(
padding: const EdgeInsets.only(top: 20), padding: const EdgeInsets.only(top: 20),
@ -223,6 +225,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
}, },
), ),
), ),
),
], ],
), ),
)), )),

@ -114,7 +114,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
height: 10, height: 10,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, //height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).clinic, hintText: TranslationBase.of(context).clinic,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
validationError: clinicError, validationError: clinicError,
@ -158,7 +158,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
height: 20, height: 20,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, //height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).doctor, hintText: TranslationBase.of(context).doctor,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
dropDownText: _selectedDoctor != null ? _selectedDoctor['DoctorName'] : null, dropDownText: _selectedDoctor != null ? _selectedDoctor['DoctorName'] : null,
@ -253,7 +253,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
height: 10, height: 10,
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, //height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).dietType, hintText: TranslationBase.of(context).dietType,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,
validationError: dietTypeError, validationError: dietTypeError,

@ -164,23 +164,23 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
), ),
], ],
)), )),
Column( // Column(
crossAxisAlignment: CrossAxisAlignment.end, // crossAxisAlignment: CrossAxisAlignment.end,
children: [ // children: [
AppText( // AppText(
'${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index].createdOn!, "dd MMM yyyy")}', // '${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index].createdOn!, "dd MMM yyyy")}',
color: Color(0xFF2E303A), // color: Color(0xFF2E303A),
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
fontSize: 1.6 * SizeConfig.textMultiplier, // fontSize: 1.6 * SizeConfig.textMultiplier,
), // ),
AppText( // AppText(
'${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index]!.createdOn!, "hh:mm a")}', // '${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index]!.createdOn!, "hh:mm a")}',
color: Color(0xFF2E303A), // color: Color(0xFF2E303A),
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
fontSize: 1.5 * SizeConfig.textMultiplier, // fontSize: 1.5 * SizeConfig.textMultiplier,
), // ),
], // ],
), // ),
], ],
), ),
Row( Row(

@ -14,6 +14,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../../../models/patient/profile/patient_profile_app_bar_model.dart';
class VitalSignItemDetailsScreen extends StatelessWidget { class VitalSignItemDetailsScreen extends StatelessWidget {
final vitalSignDetails? pageKey; final vitalSignDetails? pageKey;
final String? pageTitle; final String? pageTitle;
@ -191,13 +193,9 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
appBarTitle: pageTitle ?? "", appBarTitle: pageTitle ?? "",
backgroundColor: Color.fromRGBO(248, 248, 248, 1), backgroundColor: Color.fromRGBO(248, 248, 248, 1),
isShowAppBar: true, isShowAppBar: true,
patientProfileAppBarModel: PatientProfileAppBarModel(patient: patient),
// appBar: PatientProfileAppBar( // appBar: PatientProfileAppBar(
// patient,), // patient,),
patientProfileAppBarModel: PatientProfileAppBarModel(
patient: patient,
),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -3,6 +3,7 @@ import 'dart:typed_data';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -37,10 +38,53 @@ class MedicineItemWidget extends StatefulWidget {
class _MedicineItemWidgetState extends State<MedicineItemWidget> { class _MedicineItemWidgetState extends State<MedicineItemWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new RoundedContainer( return CardWithBgWidget(
height: SizeConfig.heightMultiplier * 8, padding: 0,
marginLeft: 10,
marginSymmetric: 10,
hasBorder: false,
bgColor: Colors.white,
widget: Container(
color: Colors.white,
padding: EdgeInsets.all(20),
child: InkWell(
child: Row(
// crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
if (widget.url != null)
Container(
height: 39,
width: 39,
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(7)),
child: Image.network(
widget.url!,
height: SizeConfig.imageSizeMultiplier * 15,
width: SizeConfig.imageSizeMultiplier * 15,
fit: BoxFit.cover,
),
),
),
Container(
child: Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: EdgeInsets.all(5),
child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))),
),
Icon(EvaIcons.eye)
],
),
),
),
);
CardWithBgWidget(
widget: Container(
height: 100,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
@ -59,19 +103,17 @@ class _MedicineItemWidgetState extends State<MedicineItemWidget> {
), ),
), ),
), ),
Expanded( Container(
child: Expanded(
child: Padding( child: Padding(
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))), child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))),
),
Icon(EvaIcons.eye) Icon(EvaIcons.eye)
], ],
), ),
), ),
backgroundColor: widget.backgroundColor, bgColor:Colors.white,
showBorder: widget.showBorder,
borderColor: widget.borderColor,
margin: EdgeInsets.all(4),
raduis: 10,
); );
} }

@ -50,8 +50,8 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
this.profileUrl, this.profileUrl,
this.invoiceNO, this.invoiceNO,
this.orderNo, this.orderNo,
this.isPrescriptions, this.isPrescriptions=false,
this.isMedicalFile, this.isMedicalFile =false,
this.episode, this.episode,
this.visitDate, this.visitDate,
this.clinic, this.clinic,

@ -103,7 +103,7 @@ class _AppDrawerState extends State<AppDrawer> {
Padding( Padding(
padding: EdgeInsets.only(top: 0), padding: EdgeInsets.only(top: 0),
child: AppText( child: AppText(
authenticationViewModel! authenticationViewModel
.doctorProfile?.clinicDescription!, .doctorProfile?.clinicDescription!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save