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" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 30 compileSdkVersion 31
// signingConfigs { // signingConfigs {
// release { // release {

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

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

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

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

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