fix progress_note issue

merge-requests/571/head
Elham Rababah 5 years ago
parent 1a830b7f44
commit 89f29d5de7

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/core/model/note/note_model.dart';
import 'package:doctor_app_flutter/core/model/note/update_note_model.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/progress_note_request.dart';
@ -14,6 +15,7 @@ import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.d
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
import '../../../../config/shared_pref_kay.dart';
import '../../../../models/patient/patiant_info_model.dart';
@ -37,6 +39,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
var filteredNotesList;
final _controller = TextEditingController();
var _isInit = true;
AuthViewModel authProvider;
getProgressNoteList(BuildContext context, PatientViewModel model, {bool isLocalBusy = false}) async {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
@ -60,6 +64,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
@override
Widget build(BuildContext context) {
authProvider = Provider.of(context);
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
String arrivalType = routeArgs['arrivalType'];
@ -113,7 +118,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
CrossAxisAlignment.start,
children: [
if (model.patientProgressNoteList[index].status != 2 &&
model.patientProgressNoteList[index].status != 4)
model.patientProgressNoteList[index].status != 4 && authProvider.doctorProfile.doctorID == model.patientProgressNoteList[index].createdBy)
Row(
crossAxisAlignment:
CrossAxisAlignment.start,

@ -34,13 +34,13 @@ class MyScheduleWidget extends StatelessWidget {
),
AppText(
projectViewModel.isArabic?DateUtils.getWeekDayArabic(workingHoursTable.date.weekday): DateUtils.getWeekDay(workingHoursTable.date.weekday) ,
fontSize: 18,
fontSize: 16,
fontFamily: 'Poppins',
// fontSize: 18
),
AppText(
' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}',
fontSize: 18,
fontSize: 14,
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
// fontSize: 18

Loading…
Cancel
Save