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

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

Browse Source 
* '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
ipd-changes-for-vida-plus
Sultan Khan 6 months ago
parent 90ebfdbe18 8404737af5
commit 58f3f62120
5 changed files with 216 additions and 201 deletions
Show Stats Download Patch File Download Diff File

3
lib/core/viewModel/patient-referral-viewmodel.dart
Unescape Escape View File

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

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

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

8
lib/screens/patients/profile/lab_result/labs_home_page.dart
Unescape Escape View File

@ -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/shared/app_scaffold_widget.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:flutter/material.dart';
import 'package:provider/provider.dart';
@ -75,7 +76,9 @@ class _LabsHomePageState extends State<LabsHomePage> {
physics: BouncingScrollPhysics(),
child: FractionallySizedBox(
widthFactor: 1.0,
child: Column(
child: NetworkBaseView(
baseViewModel: model,
child:Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
@ -199,7 +202,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
error: TranslationBase.of(context).noDataAvailable,
))
],
),
),)
),
),
),
@ -207,5 +210,6 @@ class _LabsHomePageState extends State<LabsHomePage> {
),
),
);
}
}

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

@ -148,7 +148,11 @@ class ReferredPatientDetailScreen extends StatelessWidget {
: Colors.red[700]!,
),
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',
fontWeight: FontWeight.w600,
fontSize: 2.0 * SizeConfig.textMultiplier!,
@ -179,7 +183,11 @@ class ReferredPatientDetailScreen extends StatelessWidget {
],
),
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',
fontWeight: FontWeight.w600,
fontSize: 1.8 * SizeConfig.textMultiplier!,

2
lib/screens/procedures/add_procedure_page.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save