bug fixes

merge-requests/355/head
Sultan Khan 5 years ago
parent 704d2484cf
commit 5861d159ac

@ -15,6 +15,7 @@ import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/doctor/patient_arrival_screen.dart';
import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart';
import 'package:doctor_app_flutter/screens/patients/patients_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/my-referral-patient-screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart';
@ -69,6 +70,26 @@ class _DashboardScreenState extends State<DashboardScreen> {
var clinicName = [];
int sliderActiveIndex = 0;
var clinicId;
var _patientSearchFormValues = PatientModel(
FirstName: "0",
MiddleName: "0",
LastName: "0",
PatientMobileNumber: "0",
PatientIdentificationID: "0",
PatientID: 0,
From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
.toString(),
LanguageID: 2,
stamp: "2020-03-02T13:56:39.170Z",
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
SessionID: "5G0yXn0Jnq",
IsLoginForDoctorApp: true,
PatientOutSA: false);
void didChangeDependencies() async {
super.didChangeDependencies();
if (_isInit) {
@ -961,12 +982,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
),
hasBorder: false,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
PatientArrivalScreen(),
));
Navigator.of(context)
.pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues,
"selectedType": "7"
});
},
),
DashboardItem(

@ -114,11 +114,6 @@ class _PatientArrivalScreen extends State<PatientArrivalScreen>
physics: BouncingScrollPhysics(),
controller: _tabController,
children: <Widget>[
PatientsScreen(
patientSearchForm: _patientSearchFormValues,
selectedType: "7",
isAppbar: false,
),
AddRescheduleLeavScreen(),
],
),

@ -28,7 +28,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
{model.getRescheduleLeave(), model.getCoveringDoctors()},
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: false,
isShowAppBar: true,
appBarTitle: TranslationBase.of(context).rescheduleLeaves,
body: model.getReschduleLeave.length > 0
? SingleChildScrollView(

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.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/screens/reschedule-leaves/add-rescheduleleave.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:flutter/material.dart';
@ -73,8 +74,9 @@ class _AppDrawerState extends State<AppDrawer> {
),
SizedBox(height: 15),
InkWell(
onTap: (){
Navigator.of(context).pushNamed(PROFILE, arguments: {
onTap: () {
Navigator.of(context)
.pushNamed(PROFILE, arguments: {
'title': authProvider.doctorProfile.doctorName,
"doctorProfileall": authProvider.doctorProfile
});
@ -87,8 +89,7 @@ class _AppDrawerState extends State<AppDrawer> {
SizeConfig.imageSizeMultiplier * 12,
// radius: (52)
child: ClipRRect(
borderRadius:BorderRadius.circular(50),
borderRadius: BorderRadius.circular(50),
child: Image.network(
authProvider
.doctorProfile.doctorImageURL,
@ -103,7 +104,9 @@ class _AppDrawerState extends State<AppDrawer> {
? Padding(
padding: EdgeInsets.only(top: 10),
child: AppText(
TranslationBase.of(context).dr +authProvider.doctorProfile?.doctorName,
TranslationBase.of(context).dr +
authProvider
.doctorProfile?.doctorName,
fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: SizeConfig.textMultiplier * 2,
@ -138,6 +141,20 @@ class _AppDrawerState extends State<AppDrawer> {
Navigator.of(context).pushNamed(SETTINGS);
},
),
InkWell(
child: DrawerItem(TranslationBase.of(context).rescheduleLeaves,
DoctorApp.leaves),
onTap: () {
Navigator.pop(context);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AddRescheduleLeavScreen(),
// MyReferredPatient(),
));
},
),
InkWell(
child: DrawerItem(
TranslationBase.of(context).qr +

Loading…
Cancel
Save