Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix some issues

Browse Source
merge-requests/961/head
RoaaGhali98 3 years ago
parent b8076f177b
commit e8b5165953
9 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/config.dart
Unescape Escape View File

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

4
lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
Unescape Escape View File

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

4
lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart
Unescape Escape View File

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

2
lib/screens/patients/ReferralDischargedPatientDetails.dart
Unescape Escape View File

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

2
lib/screens/patients/profile/referral/my-referral-detail-screen.dart
Unescape Escape View File

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

2
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
Unescape Escape View File

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

16
lib/screens/patients/profile/referral/referred-patient-screen.dart
Unescape Escape View File

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

3
lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
Unescape Escape View File

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

19
lib/widgets/patients/patient-referral-item-widget.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save