we fix some issues in MedicalReportPage, patient-profile-app-bar and vital_sign_item_details_screen

merge-requests/932/head
RoaaGhali98 4 years ago
parent 0719f00c51
commit 7af9e2e9e1

@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {
compileSdkVersion 30
compileSdkVersion 31
// signingConfigs {
// release {

@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.5.20'
repositories {
google()
jcenter()

@ -164,23 +164,23 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
),
],
)),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText(
'${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index].createdOn!, "dd MMM yyyy")}',
color: Color(0xFF2E303A),
fontWeight: FontWeight.w600,
fontSize: 1.6 * SizeConfig.textMultiplier,
),
AppText(
'${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index]!.createdOn!, "hh:mm a")}',
color: Color(0xFF2E303A),
fontWeight: FontWeight.w600,
fontSize: 1.5 * SizeConfig.textMultiplier,
),
],
),
// Column(
// crossAxisAlignment: CrossAxisAlignment.end,
// children: [
// AppText(
// '${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index].createdOn!, "dd MMM yyyy")}',
// color: Color(0xFF2E303A),
// fontWeight: FontWeight.w600,
// fontSize: 1.6 * SizeConfig.textMultiplier,
// ),
// AppText(
// '${AppDateUtils.convertDateFromServerFormat(model.medicalReportList[index]!.editedOn! ?? model.medicalReportList[index]!.createdOn!, "hh:mm a")}',
// color: Color(0xFF2E303A),
// fontWeight: FontWeight.w600,
// fontSize: 1.5 * SizeConfig.textMultiplier,
// ),
// ],
// ),
],
),
Row(

@ -13,6 +13,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../../../models/patient/profile/patient_profile_app_bar_model.dart';
class VitalSignItemDetailsScreen extends StatelessWidget {
final vitalSignDetails? pageKey;
final String? pageTitle;
@ -190,8 +192,9 @@ class VitalSignItemDetailsScreen extends StatelessWidget {
appBarTitle: pageTitle ?? "",
backgroundColor: Color.fromRGBO(248, 248, 248, 1),
isShowAppBar: true,
appBar: PatientProfileAppBar(
patient,),
patientProfileAppBarModel: PatientProfileAppBarModel(patient: patient),
// appBar: PatientProfileAppBar(
// patient,),
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -50,8 +50,8 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget {
this.profileUrl,
this.invoiceNO,
this.orderNo,
this.isPrescriptions,
this.isMedicalFile,
this.isPrescriptions=false,
this.isMedicalFile =false,
this.episode,
this.visitDate,
this.clinic,

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save