Merge branch 'mirza_home_page' into 'development_new_design_2.0'

feedback status bar

See merge request Cloud_Solution/diplomatic-quarter!475
merge-update-with-lab-changes
haroon amjad 4 years ago
commit be2854c906

@ -17,8 +17,8 @@ const PACKAGES_ORDERS = '/api/orders';
const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// 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 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/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -26,6 +26,7 @@ class COCItem {
String status; String status;
String statusAr; String statusAr;
dynamic statusEn; dynamic statusEn;
int statusId;
COCItem({ COCItem({
this.appointment, this.appointment,
@ -55,6 +56,7 @@ class COCItem {
this.status, this.status,
this.statusAr, this.statusAr,
this.statusEn, this.statusEn,
this.statusId,
}); });
COCItem.fromJson(Map<String, dynamic> json) { COCItem.fromJson(Map<String, dynamic> json) {
@ -85,6 +87,7 @@ class COCItem {
status = json['Status']; status = json['Status'];
statusAr = json['StatusAr']; statusAr = json['StatusAr'];
statusEn = json['StatusEn']; statusEn = json['StatusEn'];
statusId = json['StatusId'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/feedback/feedback_view_mode
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback-detail.dart'; import 'package:diplomaticquarterapp/pages/feedback/feedback-detail.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@ -28,10 +29,10 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
TextEditingController complainNumberController = TextEditingController(); TextEditingController complainNumberController = TextEditingController();
StatusType statusType = StatusType.ComplaintNumber; StatusType statusType = StatusType.ComplaintNumber;
int selectedStatusIndex = 3; int selectedStatusIndex = 3;
ProjectViewModel projectViewModel;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); projectViewModel = Provider.of(context);
return BaseView<FeedbackViewModel>( return BaseView<FeedbackViewModel>(
allowAny: true, allowAny: true,
onModelReady: (model) { onModelReady: (model) {
@ -202,38 +203,67 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
shrinkWrap: isLogin ? false : true, shrinkWrap: isLogin ? false : true,
physics: isLogin ? null : NeverScrollableScrollPhysics(), physics: isLogin ? null : NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => InkWell( itemBuilder: (context, index) => InkWell(
onTap: () {}, onTap: () {
// sss
},
child: Container( child: Container(
decoration: cardRadius(12), margin: EdgeInsets.only(top: 12),
margin: EdgeInsets.all(10), decoration: BoxDecoration(
child: Padding( color: (cOCItemList[index].statusId==7||cOCItemList[index].statusId==8)?CustomColors.accentColor:(cOCItemList[index].statusId==10||cOCItemList[index].statusId==6||cOCItemList[index].statusId==9)?CustomColors.green:CustomColors.orange,
padding: const EdgeInsets.all(12.0), borderRadius: BorderRadius.all(
child: Row( Radius.circular(10.0),
mainAxisAlignment: MainAxisAlignment.spaceBetween, ),
children: [ boxShadow: [
Column( BoxShadow(
crossAxisAlignment: CrossAxisAlignment.start, color: Color(0xff000000).withOpacity(.05),
children: [ blurRadius: 27,
Text(isArabic ? cOCItemList[index].statusAr : cOCItemList[index].status, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)), offset: Offset(0, -3),
Container( ),
margin: EdgeInsets.only(top: 5.0), ],
child: Text(cOCItemList[index].formType.toString(), ),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12))),
MyRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic), child: Container(
Text(cOCItemList[index].cOCTitle, margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12)), padding: EdgeInsets.symmetric(vertical: 14, horizontal: 12),
], decoration: BoxDecoration(
), color: Colors.white,
Column( border: Border.all(color: Colors.white, width: 1),
crossAxisAlignment: CrossAxisAlignment.end, borderRadius: BorderRadius.only(
children: [ bottomRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
Text(cOCItemList[index].date.split(" ")[0], topRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)), bottomLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
Text(cOCItemList[index].date.split(" ")[1].substring(0, 4), topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)), ),
], ),
), child: Padding(
], padding: const EdgeInsets.all(12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(isArabic ? cOCItemList[index].statusAr : cOCItemList[index].status, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)),
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(cOCItemList[index].formType.toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12))),
MyRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic),
Text(cOCItemList[index].cOCTitle,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12)),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(cOCItemList[index].date.split(" ")[0],
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
Text(cOCItemList[index].date.split(" ")[1].substring(0, 4),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
],
),
],
),
), ),
), ),
), ),

Loading…
Cancel
Save