Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix categories & cantact design

Browse Source
merge-requests/575/head
Fatimah Alshammari 4 years ago
parent 7634c35e3d
commit cc783045bb
4 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/LacumAccountInformation.dart';
@ -97,7 +98,7 @@ class OrderModelViewModel extends BaseViewModel {
return res;
}
Future makeReview(PharmacyProduct product, double rating, String reviewText, context) async {
Future makeReview(PharmacyProduct product, double rating, String reviewText) async {
setState(ViewState.Busy);
await _orderDetailsService.makeReview(product, rating, reviewText);
if (_orderDetailsService.hasError) {
@ -106,7 +107,7 @@ class OrderModelViewModel extends BaseViewModel {
AppToast.showErrorToast(message: error);
} else {
setState(ViewState.Idle);
AppToast.showSuccessToast(message: TranslationBase.of(context).submitReview);
AppToast.showSuccessToast(message: TranslationBase.of(AppGlobal.context).submitReview);
// AppToast.showSuccessToast(
// message: "Your review has been Submitted successfully");
}

4
lib/pages/final_products_page.dart
Unescape Escape View File

@ -421,7 +421,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
Column(
children: [
Container(
width: model.finalProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 4.3 : 0,
width: model.finalProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 3.70 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
@ -462,7 +462,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
height: 4.0,
),
Container(
width: MediaQuery.of(context).size.width * 0.64,
width: MediaQuery.of(context).size.width * 0.55,
child: Texts(projectViewModel.isArabic ? model.finalProducts[index].namen : model.finalProducts[index].name,
// model.finalProducts[index].name,
regular: true,

5
lib/pages/pharmacy/order/ProductReview.dart
Unescape Escape View File

@ -36,6 +36,7 @@ class _ProductReviewPageState extends State<ProductReviewPage> {
isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
body: Container(
color: Colors.white,
child: !finishReview ? SingleChildScrollView(
@ -118,7 +119,7 @@ class _ProductReviewPageState extends State<ProductReviewPage> {
child: RichText(
text: TextSpan(
text:
'(${widget.product.approvedTotalReviews} reviews)',
'(${widget.product.approvedTotalReviews} ${TranslationBase.of(context).reviews})',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.grey,
@ -203,7 +204,7 @@ class _ProductReviewPageState extends State<ProductReviewPage> {
? () {
model
.makeReview(
widget.product, ratingValue, reviewText, context)
widget.product, ratingValue, reviewText)
.then((value) {
setState(() {
finishReview = true;

92
lib/pages/pharmacy/pharmacyContacts.dart
Unescape Escape View File

@ -1,10 +1,12 @@
import 'dart:io' show Platform;
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:map_launcher/map_launcher.dart';
import 'dart:io' show Platform;
@ -17,6 +19,7 @@ class pharmacyContactsPage extends StatefulWidget {
class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
final latitude = "24.704016";
final longitude = "46.676691";
final phone = "+966112833400";
@ -48,7 +51,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
),
child: Container(
margin: EdgeInsets.all(10),
padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
padding: EdgeInsets.fromLTRB(5, 15, 5, 5),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(15),
@ -58,17 +61,82 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
child: Text(TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
),
child: projectViewModel.isArabic ?
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("أوقات عمل مركز الخدمات الصيدلانية:",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 18,
fontWeight: FontWeight.bold,
letterSpacing: -0.68)),
SizedBox(height: 8),
Text(" السبت - الأربعاء : من 8 صباحاً إلى 10 مساءً ",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
SizedBox(height: 5),
Text("الــــخـــمــــيـــس : من 8 صباحاً إلى 8 مساءً",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
SizedBox(height: 5),
Text("الـــجــــمـــــعـــــة : من 2 ظـهـراً إلى 8 مساءً",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
],
):Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Pharmaceutical Service Center working hours: ",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.bold,
letterSpacing: -0.68)),
SizedBox(height: 8),
Text("Sat – Wed: from 8 AM to 10 PM",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
SizedBox(height: 5),
Text("Thursday: from 8 AM to 8 PM",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
SizedBox(height: 5),
Text("Friday : from 2 PM to 8 PM",
//TranslationBase.of(context).contactUsTime,
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
fontWeight: FontWeight.w600,
letterSpacing: -0.68)),
],
),
),
SizedBox(
height: 35,
height: 20,
),
Row(
children: <Widget>[
@ -94,7 +162,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
SizedBox(
width: 30,
),
Text("+966 " + " -11- 2833400",
Text(projectViewModel.isArabic ? "2833400 " + " -11- 966+": "+966 " + " -11- 2833400",
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,
@ -130,7 +198,7 @@ class _pharmacyContactsPageState extends State<pharmacyContactsPage> {
SizedBox(
width: 30,
),
Text("+966 " + " 558434444",
Text(projectViewModel.isArabic ? "558434444 " + " 966+" :"+966 " + " 558434444",
style: TextStyle(
color: Colors.grey[700],
fontSize: 16,

Write Preview
Loading…
Cancel
Save