Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan

merge-update-with-lab-changes
Sultan Khan 5 years ago
commit 5e6bcadec0

@ -7,8 +7,8 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
const MAX_SMALL_SCREEN = 660; const MAX_SMALL_SCREEN = 660;
//const BASE_URL = 'https://uat.hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject';
///Doctor ///Doctor

@ -1022,5 +1022,18 @@ const Map localizedValues = {
"in-patient": { "in-patient": {
"en": "In Patient", "en": "In Patient",
"ar": "تنويم" "ar": "تنويم"
} },
"report": {
"en": "Radiology Report",
"ar": "تقرير الاشعة"
},
"open-rad": {
"en": "Open Image",
"ar": "فتح صور الاشعة"
},
"send-copy": {
"en": "Email the Report",
"ar": "أرسل التقرير"
},
}; };

@ -74,7 +74,7 @@ class _FeedbackHomePageState extends State<FeedbackHomePage>
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
indicatorColor: Colors.red[800], indicatorColor: Theme.of(context).primaryColor,
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
labelPadding: labelPadding:
EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0),

@ -514,7 +514,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
leading: Radio( leading: Radio(
value: MessageType.ComplaintOnAnAppointment, value: MessageType.ComplaintOnAnAppointment,
groupValue: model.messageTypeDialog, groupValue: model.messageTypeDialog,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (MessageType value) => onChanged: (MessageType value) =>
model.setMessageDialogType(value), model.setMessageDialogType(value),
), ),
@ -538,7 +538,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
leading: Radio( leading: Radio(
value: MessageType.ComplaintWithoutAppointment, value: MessageType.ComplaintWithoutAppointment,
groupValue: model.messageTypeDialog, groupValue: model.messageTypeDialog,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (MessageType value) => onChanged: (MessageType value) =>
model.setMessageDialogType(value), model.setMessageDialogType(value),
), ),
@ -562,7 +562,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
leading: Radio( leading: Radio(
value: MessageType.Question, value: MessageType.Question,
groupValue: model.messageTypeDialog, groupValue: model.messageTypeDialog,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (MessageType value) => onChanged: (MessageType value) =>
model.setMessageDialogType(value), model.setMessageDialogType(value),
), ),
@ -586,7 +586,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
leading: Radio( leading: Radio(
value: MessageType.Compliment, value: MessageType.Compliment,
groupValue: model.messageTypeDialog, groupValue: model.messageTypeDialog,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (MessageType value) => onChanged: (MessageType value) =>
model.setMessageDialogType(value), model.setMessageDialogType(value),
), ),
@ -610,7 +610,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
leading: Radio( leading: Radio(
value: MessageType.Suggestion, value: MessageType.Suggestion,
groupValue: model.messageTypeDialog, groupValue: model.messageTypeDialog,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (MessageType value) => onChanged: (MessageType value) =>
model.setMessageDialogType(value), model.setMessageDialogType(value),
), ),
@ -644,7 +644,7 @@ class FeedbackTypeDialogState extends State<FeedbackTypeDialog> {
child: Center( child: Center(
child: Texts( child: Texts(
TranslationBase.of(context).cancel, TranslationBase.of(context).cancel,
color: Colors.red, color: Theme.of(context).primaryColor,
), ),
), ),
), ),

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart'; import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/radiology_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/radiology_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -21,7 +22,7 @@ class RadiologyDetailsPage extends StatelessWidget {
lineItem: finalRadiology.invoiceLineItemNo, lineItem: finalRadiology.invoiceLineItemNo,
invoiceNo: finalRadiology.invoiceNo), invoiceNo: finalRadiology.invoiceNo),
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
appBarTitle: 'Radiology Report', appBarTitle: TranslationBase.of(context).report,
isShowAppBar: true, isShowAppBar: true,
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
@ -45,7 +46,7 @@ class RadiologyDetailsPage extends StatelessWidget {
onTap: () { onTap: () {
launch(model.radImageURL); launch(model.radImageURL);
}, },
label: 'Open Radio Image', label: TranslationBase.of(context).openRad,
backgroundColor: Colors.grey[800], backgroundColor: Colors.grey[800],
), ),
), ),
@ -54,9 +55,9 @@ class RadiologyDetailsPage extends StatelessWidget {
child: Button( child: Button(
onTap: () => model.sendRadReportEmail( onTap: () => model.sendRadReportEmail(
finalRadiology: finalRadiology), finalRadiology: finalRadiology),
label: 'Send Copy', label: TranslationBase.of(context).sendCopyRad,
loading: model.state == ViewState.BusyLocal, loading: model.state == ViewState.BusyLocal,
backgroundColor: Colors.red[800], backgroundColor: Theme.of(context).primaryColor,
), ),
) )
], ],

@ -38,7 +38,7 @@ class RadiologyHomePage extends StatelessWidget {
leading: Radio( leading: Radio(
value: FilterType.Clinic, value: FilterType.Clinic,
groupValue: model.filterType, groupValue: model.filterType,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (FilterType value) { onChanged: (FilterType value) {
model.setFilterType(value); model.setFilterType(value);
}, },
@ -56,7 +56,7 @@ class RadiologyHomePage extends StatelessWidget {
leading: Radio( leading: Radio(
value: FilterType.Hospital, value: FilterType.Hospital,
groupValue: model.filterType, groupValue: model.filterType,
activeColor: Colors.red[800], activeColor: Theme.of(context).primaryColor,
onChanged: (FilterType value) { onChanged: (FilterType value) {
model.setFilterType(value); model.setFilterType(value);
}, },

@ -863,6 +863,9 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
String get range => localizedValues['range'][locale.languageCode]; String get range => localizedValues['range'][locale.languageCode];
String get outpatient => localizedValues['out-patient'][locale.languageCode]; String get outpatient => localizedValues['out-patient'][locale.languageCode];
String get inPatient => localizedValues['in-patient'][locale.languageCode]; String get inPatient => localizedValues['in-patient'][locale.languageCode];
String get report => localizedValues['report'][locale.languageCode];
String get openRad => localizedValues['open-rad'][locale.languageCode];
String get sendCopyRad => localizedValues['send-copy'][locale.languageCode];
} }

Loading…
Cancel
Save