merge-update-with-lab-changes
haroon amjad 2 years ago
parent 6f20f1b871
commit c0595a8dc6

@ -30,9 +30,9 @@ class GetMedicalInstructions {
clinicNameField = json['clinicNameField'];
doctorNameField = json['doctorNameField'];
expectedAdmissionDateField = json['expectedAdmissionDateField'];
if (json['medicaLInstructionsField'] != null) {
if (json['medicaLInstructions'] != null) {
medicaLInstructionsField = <MedicaLInstructionsField>[];
json['medicaLInstructionsField'].forEach((v) {
json['medicaLInstructions'].forEach((v) {
medicaLInstructionsField.add(new MedicaLInstructionsField.fromJson(v));
});
}
@ -71,7 +71,7 @@ class MedicaLInstructionsField {
MedicaLInstructionsField.fromJson(Map<String, dynamic> json) {
propertyChanged = json['PropertyChanged'];
descriptionField = json['descriptionField'];
descriptionField = json['description'];
parameterCodeField = json['parameterCodeField'];
}

@ -159,7 +159,7 @@ class _BirthNotificationState extends State<BirthNotification> {
letterSpacing: -0.64,
),
),
mHeight(16.0),
mHeight(100.0),
// DefaultButton(
// TranslationBase.of(context).submit,
// (fatherNameAR.text.isEmpty || fatherName.text.isEmpty || babyNameAR.text.isEmpty || babyName.text.isEmpty) ? null : () {

@ -1,11 +1,10 @@
import 'package:badges/badges.dart';
import 'package:badges/badges.dart' as badge_import;
import 'package:diplomaticquarterapp/Constants.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/advance_payment_page.dart';
import 'package:diplomaticquarterapp/pages/medical/balance/my_balance_page.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -95,11 +94,11 @@ class PaymentService extends StatelessWidget {
? Positioned(
left: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(
@ -111,11 +110,11 @@ class PaymentService extends StatelessWidget {
: Positioned(
right: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(
@ -151,7 +150,7 @@ class PaymentService extends StatelessWidget {
navigateToToDoPage(BuildContext context) {
if (projectViewModel.isLogin) {
// if (model.count != 0) {
Navigator.push(context, FadePage(page: ToDo(isShowAppBar: true)));
Navigator.push(context, FadePage(page: ToDo(isShowAppBar: true)));
// } else {
// AppToast.showErrorToast(message: TranslationBase.of(context).upcomingEmpty);
// }

@ -4,7 +4,7 @@ import 'dart:io';
import 'dart:typed_data';
import 'package:auto_size_text/auto_size_text.dart';
import 'package:badges/badges.dart';
import 'package:badges/badges.dart' as badge_import;
import 'package:cached_network_image/cached_network_image.dart';
import 'package:connectivity/connectivity.dart';
import 'package:crypto/crypto.dart' as crypto;
@ -241,11 +241,11 @@ class Utils {
? Positioned(
left: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(
@ -259,11 +259,11 @@ class Utils {
? Positioned(
right: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(
@ -614,11 +614,11 @@ class Utils {
? Positioned(
left: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(
@ -632,11 +632,11 @@ class Utils {
? Positioned(
right: 8,
top: 4,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
elevation: 0,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(

@ -1,4 +1,4 @@
import 'package:badges/badges.dart';
import 'package:badges/badges.dart' as badge_import;
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart';
@ -106,10 +106,10 @@ class BottomNavigationItem extends StatelessWidget {
Positioned(
right: 18.0,
bottom: 28.0,
child: Badge(
child: badge_import.Badge(
toAnimate: false,
position: BadgePosition.topEnd(),
shape: BadgeShape.circle,
position: badge_import.BadgePosition.topEnd(),
shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8),
badgeContent: Container(

@ -1,5 +1,5 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:badges/badges.dart';
import 'package:badges/badges.dart' as badge_import;
import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
@ -494,7 +494,7 @@ class AppBarWidgetState extends State<AppBarWidget> {
actions: <Widget>[
(widget.isPharmacy && widget.showPharmacyCart)
? IconButton(
icon: Badge(
icon: badge_import.Badge(
badgeContent: Text(
orderPreviewViewModel.cartResponse.quantityCount.toString(),
style: TextStyle(color: Colors.white),
@ -507,8 +507,8 @@ class AppBarWidgetState extends State<AppBarWidget> {
: Container(),
(widget.isOfferPackages && widget.showOfferPackagesCart)
? IconButton(
icon: Badge(
position: BadgePosition.topStart(top: -15, start: -10),
icon: badge_import.Badge(
position: badge_import.BadgePosition.topStart(top: -15, start: -10),
badgeContent: Text(
_badgeText,
style: TextStyle(fontSize: 9, color: Colors.white, fontWeight: FontWeight.normal),

Loading…
Cancel
Save