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

add missing code

Browse Source
merge-requests/922/head
Elham Rababh 3 years ago
parent fc126caddf
commit 753a72b85e
10 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File

3
assets/images/svgs/profile_screen/diagnosis.svg
Unescape Escape View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25.47" height="29.309" viewBox="0 0 25.47 29.309">
<path id="diagnose" d="M59.073,10.053a.6.6,0,0,1,.174.123L63.268,14.2a.6.6,0,0,1,.123.174H59.669a.6.6,0,0,1-.6-.6V10.053ZM55.566,20.885A6.3,6.3,0,0,1,60.6,30.972l1.51,1.51a.811.811,0,0,1,.976.128l4.371,4.371a.81.81,0,0,1,0,1.143l-.951.951a.81.81,0,0,1-1.143,0L60.992,34.7a.811.811,0,0,1-.128-.976l-1.51-1.51a6.3,6.3,0,1,1-3.788-11.332Zm0,1.749a4.55,4.55,0,1,0,4.55,4.55A4.55,4.55,0,0,0,55.566,22.634Zm5.91,14.239-1.327-1.327a1.993,1.993,0,0,1-.584-1.433l-.373-.373a7.487,7.487,0,1,1,2.93-2.93l.373.373a2,2,0,0,1,.948.227V15.562H59.669a1.789,1.789,0,0,1-1.787-1.787V10H42.818a.6.6,0,0,0-.6.6v25.68a.6.6,0,0,0,.6.6H61.476ZM49.529,13.8a.3.3,0,0,1,.3.3v1.67H51.5a.3.3,0,0,1,.3.3V18.09a.3.3,0,0,1-.3.3h-1.67v1.67a.3.3,0,0,1-.3.3H47.508a.3.3,0,0,1-.3-.3v-1.67H45.54a.3.3,0,0,1-.3-.3V16.069a.3.3,0,0,1,.3-.3h1.67V14.1a.3.3,0,0,1,.3-.3Z" transform="translate(-42.222 -10.001)" fill="#28323a" fill-rule="evenodd"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1013 B

6
assets/images/svgs/profile_screen/operating report.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.561" height="28.306" viewBox="0 0 21.561 28.306">
<g id="medical-report" transform="translate(-61)">
<path id="Path_4648" data-name="Path 4648" d="M325,12.236a.277.277,0,0,0,.276.276h6.32a3.033,3.033,0,0,0-.581-.759L325.684,6.71A3.047,3.047,0,0,0,325,6.222Z" transform="translate(-249.405 -5.878)" fill="#28323a"/>
<path id="Path_4649" data-name="Path 4649" d="M75.872,8.293a1.937,1.937,0,0,1-1.935-1.935V0h-9.9A3.044,3.044,0,0,0,61,3.041V25.265a3.044,3.044,0,0,0,3.041,3.041h15.48a3.044,3.044,0,0,0,3.041-3.041V8.293ZM70.122,5.8a.829.829,0,1,1,0,1.659H68.464V9.122a.829.829,0,1,1-1.659,0V7.464H65.146a.829.829,0,1,1,0-1.659H66.8V4.146a.829.829,0,1,1,1.659,0V5.8ZM65.533,18.8a.829.829,0,1,1,0-1.659H77.7a.829.829,0,0,1,0,1.659Zm4.85,3.594a.829.829,0,0,1-.829.829h-4.02a.829.829,0,1,1,0-1.659h4.02A.829.829,0,0,1,70.383,22.391ZM77.7,12.716a.829.829,0,0,1,0,1.659H65.533a.829.829,0,1,1,0-1.659Z" fill="#28323a"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 985 B

3
assets/images/svgs/profile_screen/order sheets.svg
Unescape Escape View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.098" height="29.309" viewBox="0 0 21.098 29.309">
<path id="google-sheets" d="M49.083,29.309a.645.645,0,0,0,.645-.645V8.8H42.307a1.954,1.954,0,0,1-1.951-1.952V0H29.275a.645.645,0,0,0-.645.645V28.664a.645.645,0,0,0,.645.645ZM32.109,12.566h14.3V24.039h-14.3Zm7.724,8.079h5.429v2.247H39.833Zm-6.576-3.537h5.429V19.5H33.257Zm0,3.537h5.429v2.247H33.257Zm6.576-6.931h5.429v2.247H39.833Zm0,3.394h5.429V19.5H39.833Zm-6.576-3.394h5.429v2.247H33.257ZM41.79,6.846V1.491l6.282,5.873H42.307A.518.518,0,0,1,41.79,6.846Z" transform="translate(-28.63)" fill="#28323a"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 613 B

7
assets/images/svgs/profile_screen/pending orders.svg
Unescape Escape View File

@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28.196" height="28.306" viewBox="0 0 28.196 28.306">
<g id="file_1_" data-name="file (1)" transform="translate(-1)">
<path id="Path_4645" data-name="Path 4645" d="M411,8.782v5.043h5.043Z" transform="translate(-387.333 -8.296)" fill="#28323a"/>
<path id="Path_4646" data-name="Path 4646" d="M136.2,7.187a.829.829,0,0,1-.829-.829V0H123.488A2.491,2.491,0,0,0,121,2.488v9.271c.273-.025.55-.038.829-.038a9.107,9.107,0,0,1,7.032,3.317h9a.829.829,0,0,1,0,1.659h-7.909a9.053,9.053,0,0,1,.96,3.317h6.949a.829.829,0,0,1,0,1.659h-6.949a9.125,9.125,0,0,1-3.845,6.634h13.005a2.491,2.491,0,0,0,2.488-2.488V7.187Zm1.659,4.533H125.7a.829.829,0,1,1,0-1.659h12.163a.829.829,0,0,1,0,1.659Z" transform="translate(-113.366)" fill="#28323a"/>
<path id="Path_4647" data-name="Path 4647" d="M8.464,242a7.464,7.464,0,1,0,7.464,7.464A7.472,7.472,0,0,0,8.464,242Zm2.211,8.293H8.464a.829.829,0,0,1-.829-.829v-3.317a.829.829,0,0,1,1.659,0v2.488h1.382a.829.829,0,1,1,0,1.659Z" transform="translate(0 -228.621)" fill="#28323a"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

5
assets/images/svgs/profile_screen/sick leave.svg
Unescape Escape View File

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.425" height="28.306" viewBox="0 0 21.425 28.306">
<g id="medical-report_1_" data-name="medical-report (1)" transform="translate(-5.834)">
<path id="Path_4650" data-name="Path 4650" d="M24.639,0H8.455A2.624,2.624,0,0,0,5.834,2.621V25.685a2.624,2.624,0,0,0,2.621,2.621H24.639a2.623,2.623,0,0,0,2.62-2.621V2.621A2.623,2.623,0,0,0,24.639,0ZM9.195,4.748,10.826,1.94a.59.59,0,0,1,1.02.592L10.73,4.455H22.474l-.892-1.977a.589.589,0,1,1,1.074-.485L23.924,4.8a.589.589,0,0,1-.537.833H9.7a.591.591,0,0,1-.51-.886ZM24.08,17.225H19.771a.59.59,0,0,1-.556-.392l-.407-1.15-.984,7.347a.59.59,0,0,1-.568.511h-.017a.588.588,0,0,1-.578-.478L14.678,12.8l-1.3,4.359a.589.589,0,0,1-.564.422h-3.8a.59.59,0,1,1,0-1.179h3.361l1.863-6.244a.59.59,0,0,1,1.144.057l1.753,9.083.827-6.185a.589.589,0,0,1,.523-.508.6.6,0,0,1,.617.389l1.085,3.057h3.893a.59.59,0,1,1,0,1.179Z" transform="translate(0)" fill="#28323a"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 955 B

10
lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
Unescape Escape View File

@ -76,7 +76,7 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).order, TranslationBase.of(context).order,
TranslationBase.of(context).sheet, TranslationBase.of(context).sheet,
ORDER_NOTE, ORDER_NOTE,
'assets/images/svgs/profile_screen/Progress notes.svg', 'assets/images/svgs/profile_screen/order sheets.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
isDischargedPatient: isDischargedPatient), isDischargedPatient: isDischargedPatient),
PatientProfileCardModel( PatientProfileCardModel(
@ -130,14 +130,14 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).operation, TranslationBase.of(context).operation,
TranslationBase.of(context).report, TranslationBase.of(context).report,
GET_OPERATION_REPORT, GET_OPERATION_REPORT,
'assets/images/svgs/profile_screen/patient sick leave.svg', 'assets/images/svgs/profile_screen/operating report.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).pending, TranslationBase.of(context).pending,
TranslationBase.of(context).orders, TranslationBase.of(context).orders,
PENDING_ORDERS, PENDING_ORDERS,
'assets/images/svgs/profile_screen/patient sick leave.svg', 'assets/images/svgs/profile_screen/pending orders.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
@ -158,7 +158,7 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).diagnosis, TranslationBase.of(context).diagnosis,
"", "",
DIAGNOSIS_FOR_IN_PATIENT, DIAGNOSIS_FOR_IN_PATIENT,
'assets/images/svgs/profile_screen/patient sick leave.svg', 'assets/images/svgs/profile_screen/diagnosis.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
@ -179,7 +179,7 @@ class ProfileGridForInPatient extends StatelessWidget {
// if you want IOS bouncing effect, otherwise remove this line // if you want IOS bouncing effect, otherwise remove this line
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 8,
crossAxisCount: 3, crossAxisCount: 3,
), ),
//change the number as you want //change the number as you want

8
lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class ProfileGridForOther extends StatelessWidget {
TranslationBase.of(context).referral, TranslationBase.of(context).referral,
TranslationBase.of(context).patient, TranslationBase.of(context).patient,
REFER_PATIENT_TO_DOCTOR, REFER_PATIENT_TO_DOCTOR,
'patient/refer_patient.png', 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
isDisable: isFromLiveCare isDisable: isFromLiveCare
? patient.appointmentNo == null ? patient.appointmentNo == null
@ -82,7 +82,7 @@ class ProfileGridForOther extends StatelessWidget {
), ),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png', PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
isDisable: isFromLiveCare isDisable: isFromLiveCare
? patient.appointmentNo == null ? patient.appointmentNo == null
@ -96,8 +96,8 @@ class ProfileGridForOther extends StatelessWidget {
child: StaggeredGridView.countBuilder( child: StaggeredGridView.countBuilder(
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 10, crossAxisSpacing: 8,
mainAxisSpacing: 10, mainAxisSpacing: 8,
crossAxisCount: 3, crossAxisCount: 3,
itemCount: cardsList.length, itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1), staggeredTileBuilder: (int index) => StaggeredTile.fit(1),

10
lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
Unescape Escape View File

@ -54,15 +54,15 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient), isInPatient: isInpatient),
if (patient.appointmentNo != null && patient.appointmentNo != 0) if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf,
PATIENT_UCAF_REQUEST, 'patient/ucaf.png', PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0) if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient,
REFER_PATIENT_TO_DOCTOR, 'patient/refer_patient.png', REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0) if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png', PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
]; ];
@ -73,8 +73,8 @@ class ProfileGridForSearch extends StatelessWidget {
child: StaggeredGridView.countBuilder( child: StaggeredGridView.countBuilder(
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
crossAxisSpacing: 10, crossAxisSpacing: 8,
mainAxisSpacing: 10, mainAxisSpacing: 8,
crossAxisCount: 3, crossAxisCount: 3,
itemCount: cardsList.length, itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1), staggeredTileBuilder: (int index) => StaggeredTile.fit(1),

19
lib/widgets/patients/profile/PatientProfileButton.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
@ -60,7 +61,7 @@ class PatientProfileButton extends StatelessWidget {
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 0.0), margin: EdgeInsets.symmetric(horizontal: 0.0),
padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16), padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0),
child: InkWell( child: InkWell(
onTap: isDisable onTap: isDisable
? null ? null
@ -69,7 +70,9 @@ class PatientProfileButton extends StatelessWidget {
: () { : () {
navigator(context, this.route); navigator(context, this.route);
}, },
child: Column(children: <Widget>[ child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Container( Container(
padding: EdgeInsets.fromLTRB(8, 0, 8, 8), padding: EdgeInsets.fromLTRB(8, 0, 8, 8),
child: Row( child: Row(
@ -98,17 +101,19 @@ class PatientProfileButton extends StatelessWidget {
children: [ children: [
AppText( AppText(
!projectsProvider.isArabic ? this.nameLine1 : nameLine2, !projectsProvider.isArabic ? this.nameLine1 : nameLine2,
color: color ?? Color(0xFF2B353E), color: color ?? AppGlobal.appTextColor,
letterSpacing: -0.33,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.35, fontSize: SizeConfig.textMultiplier * 1.30,
), ),
AppText( AppText(
!projectsProvider.isArabic ? this.nameLine2 : nameLine1, !projectsProvider.isArabic ? this.nameLine2 : nameLine1,
color: color ?? Color(0xFF2B353E), color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.35, fontSize: SizeConfig.textMultiplier * 1.30,
), ),
if (isLoading) DrAppCircularProgressIndeicator() if (isLoading) DrAppCircularProgressIndeicator()
], ],
@ -119,9 +124,9 @@ class PatientProfileButton extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
// border: Border.all(), // border: Border.all(),
color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white, color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(15)),
border: Border.fromBorderSide(BorderSide( border: Border.fromBorderSide(BorderSide(
color: color ?? Color(0xffBBBBBB), color: color ?? Color(0xFFEFEFEF),
width: 1, width: 1,
)), )),
), ),

6
lib/widgets/patients/profile/profile_medical_info_widget_search.dart
Unescape Escape View File

@ -157,7 +157,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false, patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).patient, nameLine1: TranslationBase.of(context).patient,
nameLine2: TranslationBase.of(context).ucaf, nameLine2: TranslationBase.of(context).ucaf,
icon: 'patient/ucaf.png'), icon: 'assets/images/svgs/profile_screen/UCAF.svg'),
if (patient.appointmentNo != null && if (patient.appointmentNo != null &&
patient.appointmentNo != 0) patient.appointmentNo != 0)
PatientProfileButton( PatientProfileButton(
@ -170,7 +170,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false, patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).referral, nameLine1: TranslationBase.of(context).referral,
nameLine2: TranslationBase.of(context).patient, nameLine2: TranslationBase.of(context).patient,
icon: 'patient/refer_patient.png'), icon: 'assets/images/svgs/profile_screen/refer patient.svg'),
if (patient.appointmentNo != null && if (patient.appointmentNo != null &&
patient.appointmentNo != 0) patient.appointmentNo != 0)
PatientProfileButton( PatientProfileButton(
@ -183,7 +183,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false, patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).admission, nameLine1: TranslationBase.of(context).admission,
nameLine2: TranslationBase.of(context).request, nameLine2: TranslationBase.of(context).request,
icon: 'patient/admission_req.png'), icon: 'assets/images/svgs/profile_screen/admission req.svg'),
if (isInpatient) if (isInpatient)
PatientProfileButton( PatientProfileButton(
key: key, key: key,

Write Preview
Loading…
Cancel
Save