hot fixing

merge-requests/239/head
Mohammad Aljammal 4 years ago
parent ed729689a9
commit 30ddea6419

@ -40,7 +40,7 @@ class AppointmentRateViewModel extends BaseViewModel {
Future sendAppointmentRate(int rate, int appointmentNo, int projectID,
int doctorID, int clinicID, String note) async {
setState(ViewState.BusyLocal);
setState(ViewState.Busy);
await _appointmentRateService.sendAppointmentRate(
rate, appointmentNo, projectID, doctorID, clinicID, note);
if (_appointmentRateService.hasError) {

@ -100,14 +100,14 @@ class MyApp extends StatelessWidget {
backgroundColor: Color.fromRGBO(255, 255, 255, 1),
highlightColor: Colors.grey[100].withOpacity(0.4),
splashColor: Colors.transparent,
primaryColor: Colors.grey,
primaryColor: Color(0xff515A5D),
toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor,
bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
cursorColor: Colors.grey,
iconTheme: IconThemeData(),
appBarTheme: AppBarTheme(
color: Colors.grey[700],
color: Color(0xff515A5D),
brightness: Brightness.light,
elevation: 0.0,
actionsIconTheme: IconThemeData(

@ -171,7 +171,7 @@ class _HomePageState extends State<HomePage> {
],
),
),
Container(width: double.infinity, height: 80)
Container(width: double.infinity, height:projectViewModel.isArabic ?110: 80)
],
),
Positioned(
@ -260,7 +260,7 @@ class _HomePageState extends State<HomePage> {
)
: Container(
width: double.infinity,
height: 130,
height: projectViewModel.isArabic ? 160:130,
decoration: BoxDecoration(
color: HexColor('#A59E9E'),
shape: BoxShape.rectangle,

@ -238,15 +238,13 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
),
),
bottomSheet: Container(
height: MediaQuery.of(context).size.height * 0.13,
height: MediaQuery.of(context).size.height * 0.10,
width: double.infinity,
padding: EdgeInsets.all(12),
padding: EdgeInsets.all(18),
child: SecondaryButton(
textColor: Colors.white,
label: TranslationBase.of(context).submit,
disabled: amount.isEmpty ||
_fileTextController.text.isEmpty ||
_selectedHospital == null,
disabled: amount.isEmpty || _fileTextController.text.isEmpty || _selectedHospital == null,
onTap: () {
var mobileNum;
var patientName;

@ -74,7 +74,7 @@ class PaymentService extends StatelessWidget {
),
),
),
if(!projectViewModel.havePrivilege(33))
//if(!projectViewModel.havePrivilege(33))
Expanded(
child: InkWell(
onTap: () => navigateToToDoPage(context),
@ -117,7 +117,7 @@ class PaymentService extends StatelessWidget {
)
],
),
if(!projectViewModel.havePrivilege(33))
// if(!projectViewModel.havePrivilege(33))
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -136,12 +136,12 @@ class PaymentService extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
'My Balances',
TranslationBase.of(context).hmg,
color: HexColor('#B61422'),
bold: true,
),
Texts(
TranslationBase.of(context).payment,
TranslationBase.of(context).wallet,
fontSize: 14,
fontWeight: FontWeight.normal,
),

@ -208,8 +208,8 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
}
},
label: TranslationBase.of(context).submit,
disabled: model.state == ViewState.BusyLocal,
loading: model.state == ViewState.BusyLocal,
disabled: (model.state == ViewState.Busy || rating==0),
// loading: model.state == ViewState.BusyLocal,
textColor: Theme.of(context).backgroundColor),
),
SizedBox(

@ -206,7 +206,7 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
}
},
label: TranslationBase.of(context).next,
disabled: model.state == ViewState.BusyLocal|| rating==0,
disabled: (model.state == ViewState.BusyLocal || rating==0),
loading: model.state == ViewState.BusyLocal,
textColor: Theme.of(context).backgroundColor),
),

@ -84,6 +84,7 @@ class AppScaffold extends StatelessWidget {
isShowDecPage: isShowDecPage,
image: image,
):null,
bottomSheet: bottomSheet,
body: (!Provider.of<ProjectViewModel>(context, listen: false).isLogin &&
isShowDecPage)
? NotAutPage(

Loading…
Cancel
Save