Fix some issues

merge-requests/961/head
RoaaGhali98 4 years ago
parent b8076f177b
commit e8b5165953

@ -460,7 +460,6 @@ const GENERAL_ID = 'Cs2020@2016\$2958';
const PATIENT_TYPE = 1; const PATIENT_TYPE = 1;
const PATIENT_TYPE_ID = 1; const PATIENT_TYPE_ID = 1;
const Color IN_PROGRESS_COLOR = Color(0xFFCC9B14);
/// Timer Info /// Timer Info
const TIMER_MIN = 10; const TIMER_MIN = 10;
@ -471,5 +470,6 @@ class AppGlobal {
static Color appGreenColor = Color(0xFF359846); static Color appGreenColor = Color(0xFF359846);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A); static Color scheduleTextColor = Color(0xFF2E303A);
static Color inProgressColor = Color(0xFFCC9B14);
} }

@ -34,7 +34,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
bgColor: widget.reply.infoStatus == 99 bgColor: widget.reply.infoStatus == 99
? Color(0xFF2B353E) ? Color(0xFF2B353E)
: widget.reply.infoStatus == 4 : widget.reply.infoStatus == 4
? IN_PROGRESS_COLOR ? AppGlobal.inProgressColor
: widget.reply.infoStatus == 3 : widget.reply.infoStatus == 3
? Color(0xFFD02127) ? Color(0xFFD02127)
: AppGlobal.appGreenColor, : AppGlobal.appGreenColor,
@ -78,7 +78,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
color: widget.reply.infoStatus == 99 color: widget.reply.infoStatus == 99
? Color(0xFF2B353E) ? Color(0xFF2B353E)
: widget.reply.infoStatus == 4 : widget.reply.infoStatus == 4
? IN_PROGRESS_COLOR ? AppGlobal.inProgressColor
: widget.reply.infoStatus == 3 : widget.reply.infoStatus == 3
? Color(0xFFD02127) ? Color(0xFFD02127)
: AppGlobal.appGreenColor, : AppGlobal.appGreenColor,

@ -200,7 +200,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
Icon( Icon(
DoctorApp.warning, DoctorApp.warning,
size: 20, size: 20,
color: IN_PROGRESS_COLOR, color: AppGlobal.inProgressColor,
), ),
SizedBox( SizedBox(
width: 10, width: 10,
@ -211,7 +211,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
.recommendedSickLeaveDays, .recommendedSickLeaveDays,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 12, fontSize: 12,
color: IN_PROGRESS_COLOR, color: AppGlobal.inProgressColor,
), ),
), ),
], ],

@ -121,7 +121,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget {
fontSize: 1.9 * SizeConfig.textMultiplier, fontSize: 1.9 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: referredPatient.referralStatus == 1 color: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
: referredPatient.referralStatus == 46 : referredPatient.referralStatus == 46
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],

@ -110,7 +110,7 @@ class MyReferralDetailScreen extends StatelessWidget {
fontSize: 1.9 * SizeConfig.textMultiplier, fontSize: 1.9 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: referralPatient.referralStatus == 1 color: referralPatient.referralStatus == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
: referralPatient.referralStatus == : referralPatient.referralStatus ==
46 || 46 ||
referralPatient referralPatient

@ -156,7 +156,7 @@ class ReferralPatientDetailScreen extends StatelessWidget {
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: referredPatient.referralStatus == 1 color: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
: referredPatient.referralStatus == : referredPatient.referralStatus ==
46 || 46 ||
referredPatient referredPatient

@ -11,8 +11,6 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../../../util/helpers.dart';
import '../../../../widgets/shared/errors/error_message.dart'; import '../../../../widgets/shared/errors/error_message.dart';
class ReferredPatientScreen extends StatefulWidget { class ReferredPatientScreen extends StatefulWidget {
@ -87,10 +85,8 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
referralStatusCode: model referralStatusCode: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralStatus, .referralStatus,
patientName: patientName: "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}",
Helpers.convertToTitleCase(
"${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}",
),
patientGender: model patientGender: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.gender, .gender,
@ -108,7 +104,7 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
model model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralDate, .referralDate,
" hh:mm a"), "hh:mm a"),
patientID: patientID:
"${model.getReferredPatientItem(index).patientID}", "${model.getReferredPatientItem(index).patientID}",
isSameBranch: model isSameBranch: model
@ -127,10 +123,8 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
doctorAvatar: model doctorAvatar: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.doctorImageURL, .doctorImageURL,
referralDoctorName: referralDoctorName: "${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}",
Helpers.convertToTitleCase(
"${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}",
),
clinicDescription: model clinicDescription: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralClinicDescription, .referralClinicDescription,

@ -15,7 +15,6 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../../routes.dart'; import '../../../../routes.dart';
class ReferredPatientDetailScreen extends StatelessWidget { class ReferredPatientDetailScreen extends StatelessWidget {
@ -156,7 +155,7 @@ class ReferredPatientDetailScreen extends StatelessWidget {
fontSize: 1.9 * SizeConfig.textMultiplier, fontSize: 1.9 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: referredPatient.referralStatus == 1 color: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
: referredPatient.referralStatus == 46 : referredPatient.referralStatus == 46
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],

@ -1,15 +1,10 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.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/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../config/size_config.dart';
import '../../util/helpers.dart'; import '../../util/helpers.dart';
class PatientReferralItemWidget extends StatelessWidget { class PatientReferralItemWidget extends StatelessWidget {
@ -54,17 +49,16 @@ class PatientReferralItemWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0), margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0),
child: Column( child: Column(
children: [ children: [
Container( Container(
height: MediaQuery.of(context).size.height * 0.33,
child: CardWithBgWidget( child: CardWithBgWidget(
bgColor: referralStatusCode == 1 bgColor: referralStatusCode == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
//Color(0xffc4aa54)
: referralStatusCode == 2 : referralStatusCode == 2
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: referralStatusCode == 46 : referralStatusCode == 46
@ -89,7 +83,7 @@ class PatientReferralItemWidget extends StatelessWidget {
letterSpacing: -0.48, letterSpacing: -0.48,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: referralStatusCode == 1 color: referralStatusCode == 1
? Color(0xffc4aa54) ? AppGlobal.inProgressColor
: referralStatusCode == 2 : referralStatusCode == 2
? AppGlobal.appGreenColor ? AppGlobal.appGreenColor
: referralStatusCode == 46 : referralStatusCode == 46
@ -115,7 +109,7 @@ class PatientReferralItemWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
patientName ?? "", Helpers.convertToTitleCase(patientName ?? ""),
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xff2E303A), color: Color(0xff2E303A),
@ -133,7 +127,7 @@ class PatientReferralItemWidget extends StatelessWidget {
: Icon(DoctorApp.female_1, : Icon(DoctorApp.female_1,
color: Color(0xffF0448D)), color: Color(0xffF0448D)),
SizedBox( SizedBox(
width: 18, width: 50,
), ),
AppText( AppText(
referredTime ?? "", referredTime ?? "",
@ -142,12 +136,11 @@ class PatientReferralItemWidget extends StatelessWidget {
fontSize: 12.0, fontSize: 12.0,
color: Color(0XFF575757), color: Color(0XFF575757),
letterSpacing: -0.48, letterSpacing: -0.48,
) ),
], ],
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(

Loading…
Cancel
Save