Merge branch 'ipd-changes-for-vida-plus' of http://34.17.182.140/Haroon6138/doctor_app_flutter into ipd-changes-for-vida-plus

* 'ipd-changes-for-vida-plus' of http://34.17.182.140/Haroon6138/doctor_app_flutter:
  loader and search field issue resolved.
  referral time display issue for out patient
qassim-MOH-demo-
Sultan Khan 2 months ago
commit 58f3f62120

@ -103,13 +103,14 @@ class PatientReferralViewModel extends BaseViewModel {
error = _referralPatientService.error; error = _referralPatientService.error;
setState(ViewState.Error); setState(ViewState.Error);
} }
// await getBranches(); await getBranches();
} }
Future getBranches() async { Future getBranches() async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
if( _hospitalService.hospitals.isNotEmpty){ if( _hospitalService.hospitals.isNotEmpty){
mapHospitalToBranchList(); mapHospitalToBranchList();
setState(ViewState.Idle);
return; return;
} }

@ -193,17 +193,18 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
SizedBox( SizedBox(
width: 20, width: 20,
), ),
Column( Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// SizedBox(height: 10,), // SizedBox(height: 10,),
Row( // Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
Column( // Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
CustomRow( CustomRow(
label: TranslationBase.of(context).fileNumber, label: TranslationBase.of(context).fileNumber,
value: widget.reply.patientID.toString(), value: widget.reply.patientID.toString(),
@ -219,10 +220,10 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
SizedBox( SizedBox(
height: 8, height: 8,
), ),
], // ],
), // ),
], // ],
), // ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.5, width: MediaQuery.of(context).size.width * 0.5,
@ -261,6 +262,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
), ),
), ),
], ],
),
) )
], ],
), ),

@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrde
import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
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:provider/provider.dart'; import 'package:provider/provider.dart';
@ -75,7 +76,9 @@ class _LabsHomePageState extends State<LabsHomePage> {
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 1.0, widthFactor: 1.0,
child: Column( child: NetworkBaseView(
baseViewModel: model,
child:Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
@ -199,7 +202,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
error: TranslationBase.of(context).noDataAvailable, error: TranslationBase.of(context).noDataAvailable,
)) ))
], ],
), ),)
), ),
), ),
), ),
@ -207,5 +210,6 @@ class _LabsHomePageState extends State<LabsHomePage> {
), ),
), ),
); );
} }
} }

@ -148,7 +148,11 @@ class ReferredPatientDetailScreen extends StatelessWidget {
: Colors.red[700]!, : Colors.red[700]!,
), ),
AppText( AppText(
AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "dd MMM,yyyy"), patientType == PatientType.IN_PATIENT
? AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "dd MMM,yyyy")
:AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromString(
referredPatient.referralDate!,
)),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 2.0 * SizeConfig.textMultiplier!, fontSize: 2.0 * SizeConfig.textMultiplier!,
@ -179,7 +183,11 @@ class ReferredPatientDetailScreen extends StatelessWidget {
], ],
), ),
AppText( AppText(
AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "hh:mm a"), patientType == PatientType.IN_PATIENT
? AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "hh:mm a")
:AppDateUtils.getTimeFormated(AppDateUtils.getDateTimeFromString(
referredPatient.referralDate!),
),
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 1.8 * SizeConfig.textMultiplier!, fontSize: 1.8 * SizeConfig.textMultiplier!,

@ -147,7 +147,7 @@ class _AddProcedurePageState extends State<AddProcedurePage> {
EntityListCheckboxSearchWidget( EntityListCheckboxSearchWidget(
model: widget.model, model: widget.model,
masterList: model.categoriesList[0].entityList!, masterList: model.categoriesList[0].entityList!,
shouldDisplaySearchField: false, shouldDisplaySearchField: procedureType != ProcedureType.PROCEDURE ,
removeProcedure: (item) { removeProcedure: (item) {
EntityList? itemToBeRemoved = entityList.firstWhere((element) => item.procedureId == element.procedureId, orElse: () => EntityList()); EntityList? itemToBeRemoved = entityList.firstWhere((element) => item.procedureId == element.procedureId, orElse: () => EntityList());
if (itemToBeRemoved.procedureId != null) { if (itemToBeRemoved.procedureId != null) {

Loading…
Cancel
Save