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

bug fixes

Browse Source
merge-requests/474/head
Sultan Khan 4 years ago
parent 3f3f8da0f6
commit 32d1a19248
5 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File

15
lib/screens/dashboard_screen.dart
Unescape Escape View File

@ -79,7 +79,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
PatientID: 0,
From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
To: DateUtils.convertDateToFormat(
DateTime.now().add(Duration(days: 7, hours: 0)), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
@ -1020,12 +1021,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
hasBorder: false,
onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// SearchMedicinePatientScreen(),
// ));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
SearchMedicinePatientScreen(),
));
},
)
],

9
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -176,11 +176,12 @@ class _PatientsScreenState extends State<PatientsScreen> {
patiantAppointment =
convertDateFormat(responseModelList[i].appointmentDate);
}
if (patiantAppointment != null) {
String dateAppointment = checkDate(patiantAppointment);
String dateAppointment = checkDate(patiantAppointment);
if (dateAppointment.contains(str) || str == 'All') {
filterDate.add(responseModelList[i]);
if (dateAppointment.contains(str) || str == 'All') {
filterDate.add(responseModelList[i]);
}
}
} catch (e) {
print(e);

14
lib/screens/sick-leave/add-sickleave.dart
Unescape Escape View File

@ -10,7 +10,9 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
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/card_with_bgNew_widget.dart';
@ -29,12 +31,16 @@ class AddSickLeavScreen extends StatelessWidget {
onModelReady: (model) => model.getSickLeave(patient.patientMRN),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: false,
appBarTitle: TranslationBase.of(context).sickleave,
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(
patient,
routeArgs['patientType'] ?? "0",
routeArgs['arrivalType'] ?? "0",
),
body: SingleChildScrollView(
child: Column(children: [
PatientProfileHeaderNewDesign(
patient, routeArgs['patientType'], routeArgs['arrivalType']),
// PatientProfileHeaderNewDesign(
// patient, routeArgs['patientType'], routeArgs['arrivalType']),
patient.patientStatusType == 43
? Column(
crossAxisAlignment: CrossAxisAlignment.start,

13
lib/screens/sick-leave/show-sickleave.dart
Unescape Escape View File

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -30,13 +31,17 @@ class ShowSickLeaveScreen extends StatelessWidget {
model.getSickLeave(patient.patientMRN ?? patient.patientId),
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: false,
appBarTitle: TranslationBase.of(context).sickleave,
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(
patient,
routeArgs['patientType'] ?? "0",
routeArgs['arrivalType'] ?? "0",
),
body: SingleChildScrollView(
child: Column(
children: [
PatientProfileHeaderNewDesign(
patient, routeArgs['patientType'], routeArgs['arrivalType']),
// PatientProfileHeaderNewDesign(
// patient, routeArgs['patientType'], routeArgs['arrivalType']),
Column(
children: model.getAllSIckLeave
.map<Widget>((GetAllSickLeaveResponse item) {

25
lib/widgets/patients/PatientCard.dart
Unescape Escape View File

@ -102,14 +102,18 @@ class PatientCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [
AppText(
(Helpers.capitalize(patientInfo.firstName) +
" " +
Helpers.capitalize(patientInfo.lastName)),
fontSize: SizeConfig.textMultiplier * 2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
Container(
width: 170,
child: AppText(
(Helpers.capitalize(patientInfo.firstName) +
" " +
Helpers.capitalize(patientInfo.lastName)),
fontSize: 16,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
textOverflow: TextOverflow.ellipsis,
),
),
patientInfo.gender == 1
? Icon(
@ -143,7 +147,10 @@ class PatientCard extends StatelessWidget {
errorBuilder: (BuildContext context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
return AppText(
'No Image',
fontSize: 10,
);
},
))
: SizedBox()

Write Preview
Loading…
Cancel
Save