Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

sender & receiver transfer edit login update & fixes

Browse Source
main_design2.0
Sikander Saleem 2 years ago
parent 42808da16b
commit be6a418bb6
7 changed files with 49 additions and 60 deletions
Show Stats Download Patch File Download Diff File

23
assets/subtitles/ar_subtitle.json
Unescape Escape View File

@ -3,8 +3,6 @@
"failed_request_message": "الفشل في إكمال الطلب", "failed_request_message": "الفشل في إكمال الطلب",
"successful_request_message": "تم إكمال الطلب بنجاح", "successful_request_message": "تم إكمال الطلب بنجاح",
"request_lock_message": "انتظر حتى إكمال الطلب", "request_lock_message": "انتظر حتى إكمال الطلب",
"cancel": "إلغاء", "cancel": "إلغاء",
"confirm": "تاكيد", "confirm": "تاكيد",
"done": "تم", "done": "تم",
@ -13,7 +11,6 @@
"sign_out": "تسجيل الخروج", "sign_out": "تسجيل الخروج",
"logout_alert": "هل انت متاكد من رغبتك في تسجيل الخروج؟", "logout_alert": "هل انت متاكد من رغبتك في تسجيل الخروج؟",
"language": "اللغة", "language": "اللغة",
"name": "الاسم", "name": "الاسم",
"email": "البريد الالكتروني", "email": "البريد الالكتروني",
"phone_number": "رقم الهاتف", "phone_number": "رقم الهاتف",
@ -29,7 +26,6 @@
"confirm_password_validate_message": "كلمة المرور و تاكيد كلمة المرور غير متطابقان", "confirm_password_validate_message": "كلمة المرور و تاكيد كلمة المرور غير متطابقان",
"phone_number_validate_message": "رقم الهاتف غير صالح", "phone_number_validate_message": "رقم الهاتف غير صالح",
"terms_and_conditions_validate_message": "موافقة علي الشروط والاحكام مطاوبة", "terms_and_conditions_validate_message": "موافقة علي الشروط والاحكام مطاوبة",
"update": "تحديث", "update": "تحديث",
"step": "خطوة", "step": "خطوة",
"forget_password_with_mark": "نسيت كلمة المرور؟", "forget_password_with_mark": "نسيت كلمة المرور؟",
@ -59,7 +55,6 @@
"title_not_found": "لا يوجد عنوان", "title_not_found": "لا يوجد عنوان",
"title_validate_message": "العنوان مطلوب", "title_validate_message": "العنوان مطلوب",
"url_not_found": "لا يوجد رابط", "url_not_found": "لا يوجد رابط",
"date": "تاريخ", "date": "تاريخ",
"status": "الحالة", "status": "الحالة",
"code": "كود", "code": "كود",
@ -134,7 +129,6 @@
"visitDate": "تاريخ الزيارة", "visitDate": "تاريخ الزيارة",
"whatsApp": "واتساب", "whatsApp": "واتساب",
"workPerformed": "العمل انجز", "workPerformed": "العمل انجز",
"actualDate": "تاريخ الفعلي", "actualDate": "تاريخ الفعلي",
"expectDate": "التاريخ المتوقع", "expectDate": "التاريخ المتوقع",
"images": "الصور", "images": "الصور",
@ -164,7 +158,6 @@
"requiredImage": "الصورة مطلوبة", "requiredImage": "الصورة مطلوبة",
"taskStatus": "حالة الطلب", "taskStatus": "حالة الطلب",
"activationAlert": "الحساب قيد المراجعة يرجى الانتظار حتى يتم تفعيله", "activationAlert": "الحساب قيد المراجعة يرجى الانتظار حتى يتم تفعيله",
"attachImage": "ارفق صورة", "attachImage": "ارفق صورة",
"callLastSituation": "اخر موقف للطلب", "callLastSituation": "اخر موقف للطلب",
"customer": "العميل", "customer": "العميل",
@ -195,14 +188,14 @@
"site": "الموقع", "site": "الموقع",
"maintenanceSituation": "موقع الصيانه", "maintenanceSituation": "موقع الصيانه",
"currentSituation": "الموقع الحالي", "currentSituation": "الموقع الحالي",
"comment" : "تعليق", "comment": "تعليق",
"updateServiceRequest" : "تعديل طلب الخدمة", "updateServiceRequest": "تعديل طلب الخدمة",
"repairLocation" : "موقع الإصلاح", "repairLocation": "موقع الإصلاح",
"travelingExpense" : "مصاريف التنقل", "travelingExpense": "مصاريف التنقل",
"startDate" : "وقت البدء", "startDate": "وقت البدء",
"requestedQuantity" : "الكمية المطلوبة", "requestedQuantity": "الكمية المطلوبة",
"deliveredQuantity" : "الكمية المسلّمة", "deliveredQuantity": "الكمية المسلّمة",
"endDate" : "وقت الانتهاء", "endDate": "وقت الانتهاء",
"destinationSite": "موقع الوجهه", "destinationSite": "موقع الوجهه",
"building": "بناء", "building": "بناء",
"floor": "طابق", "floor": "طابق",

23
assets/subtitles/en_subtitle.json
Unescape Escape View File

@ -3,7 +3,6 @@
"failed_request_message": "Failed to complete request", "failed_request_message": "Failed to complete request",
"successful_request_message": "Request complete successfully", "successful_request_message": "Request complete successfully",
"request_lock_message": "Wait until your request complete", "request_lock_message": "Wait until your request complete",
"cancel": "Cancel", "cancel": "Cancel",
"confirm": "Confirm", "confirm": "Confirm",
"done": "Done", "done": "Done",
@ -12,7 +11,6 @@
"sign_out": "Sign Out", "sign_out": "Sign Out",
"logout_alert": "Are you sure you want to Sign Out?", "logout_alert": "Are you sure you want to Sign Out?",
"language": "English", "language": "English",
"name": "Name", "name": "Name",
"email": "Email", "email": "Email",
"phone_number": "Phone Number", "phone_number": "Phone Number",
@ -28,7 +26,6 @@
"confirm_password_validate_message": "Password and confirm password not match", "confirm_password_validate_message": "Password and confirm password not match",
"phone_number_validate_message": "Not valid phone number", "phone_number_validate_message": "Not valid phone number",
"terms_and_conditions_validate_message": "Accept terms and conditions is required", "terms_and_conditions_validate_message": "Accept terms and conditions is required",
"update": "Update", "update": "Update",
"step": "Step", "step": "Step",
"forget_password_with_mark": "Forget Password?", "forget_password_with_mark": "Forget Password?",
@ -58,7 +55,6 @@
"title_not_found": "Title not found", "title_not_found": "Title not found",
"title_validate_message": "Title Can't be empty", "title_validate_message": "Title Can't be empty",
"url_not_found": "URL not found", "url_not_found": "URL not found",
"date": "Date", "date": "Date",
"status": "Status", "status": "Status",
"code": "Code", "code": "Code",
@ -133,7 +129,6 @@
"visitDate": "Visit Date", "visitDate": "Visit Date",
"whatsApp": "WhatsApp", "whatsApp": "WhatsApp",
"workPerformed": "Work Performed", "workPerformed": "Work Performed",
"actualDate": "Actual Date", "actualDate": "Actual Date",
"expectDate": "Expect Date", "expectDate": "Expect Date",
"images": "Images", "images": "Images",
@ -163,7 +158,6 @@
"requiredImage": "Image Required", "requiredImage": "Image Required",
"taskStatus": "Task Status", "taskStatus": "Task Status",
"activationAlert": "Account under reviewing please wait until be activated", "activationAlert": "Account under reviewing please wait until be activated",
"attachImage": "Attach Image", "attachImage": "Attach Image",
"callLastSituation": "Call's Last Situation", "callLastSituation": "Call's Last Situation",
"customer": "Customer", "customer": "Customer",
@ -180,7 +174,7 @@
"reportType": "Report Type", "reportType": "Report Type",
"callId": "Call Id", "callId": "Call Id",
"requiredWord": "required", "requiredWord": "required",
"AssetType": "asset type", "AssetType": "Asset Type",
"workPreformed": "Work Preformed", "workPreformed": "Work Preformed",
"orderWorkNumber": "Order Work Number", "orderWorkNumber": "Order Work Number",
"assignedEmployee": "Assigned Employee", "assignedEmployee": "Assigned Employee",
@ -190,19 +184,18 @@
"site": "Site", "site": "Site",
"maintenanceSituation": "Maintenance Situation", "maintenanceSituation": "Maintenance Situation",
"currentSituation": "Current Situation", "currentSituation": "Current Situation",
"alert": "Alert", "alert": "Alert",
"duplicateAlert": "Duplicate Alert", "duplicateAlert": "Duplicate Alert",
"duplicateAlertMessage": "Are you sure you want to duplicate request?", "duplicateAlertMessage": "Are you sure you want to duplicate request?",
"duplicateRequest": "Duplicate Request", "duplicateRequest": "Duplicate Request",
"comment" : "Comment", "comment": "Comment",
"updateServiceRequest" : "Update Service Request", "updateServiceRequest": "Update Service Request",
"repairLocation" : "Repair Location", "repairLocation": "Repair Location",
"travelingExpense": "Traveling Expense", "travelingExpense": "Traveling Expense",
"startDate" : "Start Date", "startDate": "Start Date",
"requestedQuantity" : "Requested Quantity", "requestedQuantity": "Requested Quantity",
"deliveredQuantity" : "Delivered Quantity", "deliveredQuantity": "Delivered Quantity",
"endDate" : "End Date", "endDate": "End Date",
"destinationSite": "Destination Site", "destinationSite": "Destination Site",
"building": "Building", "building": "Building",
"floor": "Floor", "floor": "Floor",

6
lib/models/subtitle.dart
Unescape Escape View File

@ -196,7 +196,7 @@ class Subtitle {
String customer; String customer;
String reportType; String reportType;
String requiredWord; String requiredWord;
String AssetType; String assetType;
String reportStatus; String reportStatus;
String callLastSituation; String callLastSituation;
String invoiceNumber; String invoiceNumber;
@ -421,7 +421,7 @@ class Subtitle {
@required this.reasons, @required this.reasons,
@required this.reportStatus, @required this.reportStatus,
@required this.reportType, @required this.reportType,
@required this.AssetType, @required this.assetType,
@required this.workPreformed, @required this.workPreformed,
@required this.alert, @required this.alert,
@required this.duplicateAlert, @required this.duplicateAlert,
@ -625,7 +625,7 @@ class Subtitle {
reportType: parsedJson["reportType"], reportType: parsedJson["reportType"],
callId: parsedJson["callId"], callId: parsedJson["callId"],
requiredWord: parsedJson["requiredWord"], requiredWord: parsedJson["requiredWord"],
AssetType: parsedJson["serviceType"], assetType: parsedJson["AssetType"],
workPreformed: parsedJson["workPreformed"], workPreformed: parsedJson["workPreformed"],
alert: parsedJson["alert"], alert: parsedJson["alert"],
duplicateAlert: parsedJson["duplicateAlert"], duplicateAlert: parsedJson["duplicateAlert"],

51
lib/views/pages/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -18,6 +18,7 @@ import 'package:test_sa/views/widgets/requests/info_row.dart';
class DeviceTransferDetails extends StatefulWidget { class DeviceTransferDetails extends StatefulWidget {
final DeviceTransfer model; final DeviceTransfer model;
const DeviceTransferDetails({Key key, this.model}) : super(key: key); const DeviceTransferDetails({Key key, this.model}) : super(key: key);
@override @override
@ -47,8 +48,8 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
_settingProvider = Provider.of<SettingProvider>(context); _settingProvider = Provider.of<SettingProvider>(context);
_deviceTransferProvider = Provider.of<DeviceTransferProvider>(context); _deviceTransferProvider = Provider.of<DeviceTransferProvider>(context);
_isSender = _userProvider.user.id == widget.model.sender?.userId; _isSender = _userProvider.user.userID == widget.model.sender?.userId;
_isReceiver = _userProvider.user.id == widget.model.receiver?.userId; _isReceiver = _userProvider.user.userID == widget.model.receiver?.userId;
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
body: SafeArea( body: SafeArea(
@ -131,17 +132,18 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Sender", style: Theme.of(context).textTheme.headline6), child: Text("Sender", style: Theme.of(context).textTheme.headline6),
), ),
if (_isSender || true) ASmallButton(
ASmallButton( text: _subtitle.edit,
text: _subtitle.edit, onPressed: (_isSender || false)
onPressed: () { ? () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(
builder: (_) => UpdateDeviceTransfer( builder: (_) => UpdateDeviceTransfer(
model: widget.model, model: widget.model,
isSender: true, isSender: true,
))); )));
}, }
), : null,
),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
@ -154,17 +156,18 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Receiver", style: Theme.of(context).textTheme.headline6), child: Text("Receiver", style: Theme.of(context).textTheme.headline6),
), ),
if (_isReceiver || true) ASmallButton(
ASmallButton( text: _subtitle.edit,
text: _subtitle.edit, onPressed: (_isReceiver || false)
onPressed: () { ? () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(
builder: (_) => UpdateDeviceTransfer( builder: (_) => UpdateDeviceTransfer(
model: widget.model, model: widget.model,
isSender: false, isSender: false,
))); )));
}, }
), : null,
),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),

2
lib/views/pages/user/requests/report/create_service_report.dart
Unescape Escape View File

@ -281,7 +281,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
const SizedBox( const SizedBox(
height: 8, height: 8,
), ),
ASubTitle(_subtitle.AssetType), ASubTitle(_subtitle.assetType ??""),
_validate && _serviceReport.assetType == null _validate && _serviceReport.assetType == null
? ASubTitle( ? ASubTitle(
_subtitle.requiredWord, _subtitle.requiredWord,

2
lib/views/pages/user/requests/report/edit_service_report.dart
Unescape Escape View File

@ -278,7 +278,7 @@ class _EditServiceReportState extends State<EditServiceReport> with TickerProvid
), ),
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
ASubTitle(_subtitle.AssetType), ASubTitle(_subtitle.assetType),
_validate && _serviceReport.assetType == null _validate && _serviceReport.assetType == null
? ASubTitle( ? ASubTitle(
_subtitle.requiredWord, _subtitle.requiredWord,

2
lib/views/pages/user/requests/request_details.dart
Unescape Escape View File

@ -397,7 +397,7 @@ class RequestDetailsPage extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.all(32), padding: const EdgeInsets.all(32),
child: AButton( child: AButton(
text: "Create Report", text: "Create Work Order",
onPressed: () { onPressed: () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest))); Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest)));
}, },

Write Preview
Loading…
Cancel
Save