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

episode update inprogress

Browse Source
update_flutter_3.24_vida_plus_episode_v2
Sultan khan 12 months ago
parent 58d4f4e50e
commit 6f0133a68e
11 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File

4
assets/images/svgs/resolve.svg
Unescape Escape View File

@ -0,0 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.7941 6.92237C13.0273 6.66792 13.0101 6.27257 12.7557 6.03932C12.5012 5.80608 12.1059 5.82327 11.8726 6.07772L7.73038 10.5965L6.10862 8.97477C5.86454 8.73069 5.46881 8.73069 5.22473 8.97477C4.98066 9.21885 4.98066 9.61457 5.22473 9.85865L7.30807 11.942C7.42861 12.0625 7.59316 12.1286 7.76359 12.1249C7.93402 12.1212 8.09554 12.048 8.21073 11.9224L12.7941 6.92237Z" fill="#359846"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.04766 0.458374H8.95236C7.12678 0.458363 5.69288 0.458354 4.57336 0.608869C3.42615 0.763108 2.51594 1.08564 1.80077 1.8008C1.08561 2.51597 0.763077 3.42618 0.608838 4.57339C0.458324 5.69291 0.458333 7.12681 0.458344 8.95239V9.04769C0.458333 10.8733 0.458324 12.3072 0.608838 13.4267C0.763077 14.5739 1.08561 15.4841 1.80077 16.1993C2.51594 16.9144 3.42615 17.237 4.57336 17.3912C5.69287 17.5417 7.12676 17.5417 8.95234 17.5417H9.04765C10.8732 17.5417 12.3071 17.5417 13.4267 17.3912C14.5739 17.237 15.4841 16.9144 16.1992 16.1993C16.9144 15.4841 17.2369 14.5739 17.3912 13.4267C17.5417 12.3072 17.5417 10.8733 17.5417 9.04771V8.9524C17.5417 7.12682 17.5417 5.6929 17.3912 4.57339C17.2369 3.42618 16.9144 2.51597 16.1992 1.8008C15.4841 1.08564 14.5739 0.763108 13.4267 0.608869C12.3071 0.458354 10.8732 0.458363 9.04766 0.458374ZM2.68465 2.68468C3.12886 2.24048 3.73132 1.98333 4.73992 1.84772C5.76651 1.7097 7.11636 1.70837 9.00001 1.70837C10.8837 1.70837 12.2335 1.7097 13.2601 1.84772C14.2687 1.98333 14.8712 2.24048 15.3154 2.68468C15.7596 3.12889 16.0167 3.73135 16.1523 4.73995C16.2903 5.76654 16.2917 7.11639 16.2917 9.00004C16.2917 10.8837 16.2903 12.2335 16.1523 13.2601C16.0167 14.2687 15.7596 14.8712 15.3154 15.3154C14.8712 15.7596 14.2687 16.0168 13.2601 16.1524C12.2335 16.2904 10.8837 16.2917 9.00001 16.2917C7.11636 16.2917 5.76651 16.2904 4.73992 16.1524C3.73132 16.0168 3.12886 15.7596 2.68465 15.3154C2.24045 14.8712 1.98329 14.2687 1.84769 13.2601C1.70967 12.2335 1.70834 10.8837 1.70834 9.00004C1.70834 7.11639 1.70967 5.76654 1.84769 4.73995C1.98329 3.73135 2.24045 3.12889 2.68465 2.68468Z" fill="#359846"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

3
lib/config/localized_values.dart
Unescape Escape View File

@ -1192,5 +1192,6 @@ const Map<String, Map<String, String>> localizedValues = {
"addPhysicalExamination": {"en": "Add Physical Examination", "ar":"إضافة الفحص البدني"},
"noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"},
"noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"},
"mild": {"en": "Mild", "ar":"خفيف"},
"moderate": {"en": "Moderate", "ar":"معتدل"},
};

2
lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart
Unescape Escape View File

@ -145,7 +145,7 @@ class _UpdateObjectivePageVidaPlusState
Center(
child: Padding(
padding: const EdgeInsets.all(65),
child: EmptyExamination(),
child: EmptyWidget(TranslationBase.of(context).noPhysicalExamination),
),
),

10
lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart
Unescape Escape View File

@ -4,7 +4,12 @@ import 'package:flutter_svg/flutter_svg.dart';
import '../../../../../../../utils/translations_delegate_base_utils.dart';
class EmptyExamination extends StatelessWidget{
class EmptyWidget extends StatelessWidget{
String message = "";
EmptyWidget(this.message);
@override
Widget build(BuildContext context) {
return Column(
@ -13,7 +18,8 @@ class EmptyExamination extends StatelessWidget{
SvgPicture.asset('assets/images/svgs/unavailable.svg'),
SizedBox(height: 10,),
AppText(
TranslationBase.of(context).noPhysicalExamination,
this.message,
//TranslationBase.of(context).noPhysicalExamination,
fontSize: 12,
fontWeight: FontWeight.w400,
textAlign: TextAlign.center,

5
lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart
Unescape Escape View File

@ -58,14 +58,15 @@ class _AddAllergiesState extends State<AddAllergies> {
// },
),
bottomSheet: CustomBottomSheetContainer(
widthFactor: .9,
buttonColor: Color(0xffEAEAEA),
fontColor: Colors.black,
label: TranslationBase.of(context).cancel,
onTap: () {
Navigator.of(context).pop();
},
),
));
)),
);
}
//
// isServiceSelected(MasterKeyModel masterKey) {

4
lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart
Unescape Escape View File

@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import '../../../../../../widgets/transitions/fade_page.dart';
import '../../objective/widget/EmptyExamination.dart';
class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget {
@ -109,8 +110,7 @@ bool loading =false;
},
)
: loading ? Center(child: CircularProgressIndicator()) :SizedBox()
: widget.model.state == ViewState.BusyLocal ? Center(child: CircularProgressIndicator()) :Center(child: EmptyWidget(TranslationBase.of(context).noDataAvailable))
),
),

12
lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart
Unescape Escape View File

@ -111,7 +111,7 @@ class _ReactionsSelectionAllergiesWidgetState
MaterialTapTargetSize.shrinkWrap,
// Reduces padding around checkbox
visualDensity: VisualDensity.compact,
value: "Mild",
value: TranslationBase.of(context).mild,
groupValue: widget
.mySelectedAllergy
.allergyReactionDTOs![index]
@ -125,7 +125,7 @@ class _ReactionsSelectionAllergiesWidgetState
},
),
AppText(
'Mild',
TranslationBase.of(context).mild,
fontSize: 10,
),
],
@ -140,7 +140,7 @@ class _ReactionsSelectionAllergiesWidgetState
MaterialTapTargetSize.shrinkWrap,
// Reduces padding around checkbox
visualDensity: VisualDensity.compact,
value: "moderate",
value: TranslationBase.of(context).moderate,
groupValue: widget
.mySelectedAllergy
.allergyReactionDTOs![index]
@ -154,7 +154,7 @@ class _ReactionsSelectionAllergiesWidgetState
},
),
AppText(
'Moderate',
TranslationBase.of(context).moderate,
fontSize: 10,
),
],
@ -169,7 +169,7 @@ class _ReactionsSelectionAllergiesWidgetState
MaterialTapTargetSize.shrinkWrap,
// Reduces padding around checkbox
visualDensity: VisualDensity.compact,
value: "severe",
value: TranslationBase.of(context).severe,
groupValue: widget
.mySelectedAllergy
.allergyReactionDTOs![index]
@ -183,7 +183,7 @@ class _ReactionsSelectionAllergiesWidgetState
},
),
AppText(
'Severe',
TranslationBase.of(context).severe,
fontSize: 10,
),
],

20
lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart
Unescape Escape View File

@ -99,16 +99,18 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidgetVidaPlus> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(children: [ AppText(reaction.allergyReactionName!, fontSize: 10,),
AppText(" - "),
AppText(
Severity.values[reaction.severity! -1].name,
AppText(reaction.allergyReactionName!),
AppText(
Severity.values[reaction.severity! -1].name,
color: Color(0xFFCC9B14),
fontSize: 10,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
)
],)).toList()) : AppText("----", color: Color(0xFFCC9B14)),
color: Color(0xFFCC9B14),
fontSize: 10,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
)],)
],)).toList()) : AppText("----"),
Row(
mainAxisAlignment: MainAxisAlignment.end,

2
lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart
Unescape Escape View File

@ -144,7 +144,7 @@ class _UpdateSoapIndexVidaPlusState extends State<UpdateSoapIndexVidaPlus>
),
Container(
child: FractionallySizedBox(
widthFactor: .80,
widthFactor: .9,
child: getBottomSheet(model, patient)),
),
SizedBox(

2
lib/utils/translations_delegate_base_utils.dart
Unescape Escape View File

@ -1918,6 +1918,8 @@ class TranslationBase {
String get progressNoteType => localizedValues['progressNoteType']![locale.languageCode]!;
String get addYourNote => localizedValues['addYourNote']![locale.languageCode]!;
String get saveAsDraft => localizedValues['saveAsDraft']![locale.languageCode]!;
String get mild => localizedValues['mild']![locale.languageCode]!;
String get moderate => localizedValues['moderate']![locale.languageCode]!;
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

5
lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart
Unescape Escape View File

@ -10,9 +10,10 @@ class CustomBottomSheetContainer extends StatelessWidget {
final String label;
final Color? buttonColor;
final Color? fontColor;
final double? widthFactor;
double headerHeight = SizeConfig.heightMultiplier! * 12;
CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white }) : super(key: key);
CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key);
@override
Widget build(BuildContext context) {
@ -31,7 +32,7 @@ class CustomBottomSheetContainer extends StatelessWidget {
Container(
margin: EdgeInsets.only(top: headerHeight * (SizeConfig.isWidthLarge ? 0.3 : 0.2)),
child: FractionallySizedBox(
widthFactor: .80,
widthFactor: widthFactor,
child: Center(
child: AppButton(
fontColor: fontColor!,

Write Preview
Loading…
Cancel
Save