merge conflict resolved and file format.

design_3.0_task_module_new
Sikander Saleem 6 months ago
parent e0902eddf7
commit 33dea07449

@ -31,7 +31,7 @@
"phoneNumber": "رقم الهاتف",
"Sign in to your": "تسجيل الدخول إلى حسابك",
"account": "الحساب",
"password": "كلمة المرور",
"password": "كلمة السر",
"confirmPassword": "تاكيد كلمة المرور",
"signIn": "تسجيل الدخول",
"letSignInToAccount": "لنقم بتسجيل الدخول إلى حسابك",
@ -83,7 +83,7 @@
"status": "الحالة",
"code": "كود",
"serialNumber": "رقم تسلسلي",
"add": "اضافة",
"add": "أضف",
"brand": "ماركة",
"clearSearch": "تنظيف البحث",
"closed": "غلق",
@ -110,7 +110,7 @@
"createServiceRequest": "انشاء طلب خدمة",
"delete": "مسح",
"details": "تفاصيل",
"device": "جهاز",
"device": "الجهاز",
"deviceArName": "اسم الجهاز بعربي",
"deviceName": "اسم الجهاز",
"deviceImages": "صور الجهاز",
@ -130,7 +130,7 @@
"maintenanceIssue": "مشكلة الصيانة",
"maintenanceIssueRequired": "مطلوب مسألة صيانة",
"maxImagesNumberIs5": "أقصى عدد للصورة 5",
"model": "نموذج",
"model": "الطراز",
"modelNo": "رقم النموذج",
"modelName": "اسم النموذج",
"nameExist": "الاسم موجود",
@ -216,7 +216,7 @@
"requiredImage": "الصورة مطلوبة",
"taskStatus": "حالة الطلب",
"activationAlert": "الحساب قيد المراجعة يرجى الانتظار حتى يتم تفعيله",
"attachImage": "ارفق صورة",
"attachImage": "إرفاق صورة",
"callLastSituation": "اخر موقف للطلب",
"customer": "العميل",
"editServiceReport": "تعديل التقرير الخدمة",
@ -237,7 +237,7 @@
"checkOutOtherMethods": "اطلع على طرق أخرى.",
"otpSentToNumber": "تم إرسال رمز التحقق إلى الرقم",
"havingTroubleReceivingOtp": "تواجه صعوبة في استلام رمز التحقق؟",
"quantity": "كمية",
"quantity": "الكمية",
"installedQty": "الكمية المثبتة",
"returnQty": "كمية العودة",
"oracleNo": "رقم أوراكل",
@ -298,10 +298,10 @@
"requestedQuantity": "الكمية المطلوبة",
"deliveredQuantity": "الكمية المسلّمة",
"endDate": "وقت الانتهاء",
"destinationSite": "موقع الوجهه",
"building": "بناء",
"floor": "طابق",
"department": "قسم",
"destinationSite": "موقع الوجهة",
"building": "المبنى",
"floor": "الطابق",
"department": "القسم",
"room": "غرفه",
"actions": "اجراءات",
"deviceFiles": "ملفات الجهاز",
@ -313,7 +313,6 @@
"login": "تسجيل الدخول",
"enterCredsToLogin": "أدخل بياناتك الخاصة لتسجيل الدخول",
"forgotPassword": "نسيت كلمة السر؟",
"password": "كلمة السر",
"username": "اسم المستخدم",
"requiredField": "الحقل مطلوب",
"passwordLengthMessage": "يجب أن تتكون كلمة السر من 6 خانات على الأقل",
@ -344,50 +343,37 @@
"gasRefillRequest": "طلب إعادة تعبئة غاز",
"transferRequest": "طلب نقل",
"serviceRequest": "طلب خدمة",
"newServiceRequest" : "طلب خدمة جديدة",
"newGasRefillRequest": "طلب إعادة تعبئة غاز جديد",
"newTransferRequest": "طلب نقل جديد",
"submitRequest": "تأكيد الطلب",
"select": "إختر",
"gasType": "نوع الغاز",
"quantity" : "الكمية",
"cylinderType": "نوع الأسطوانة",
"cylinderSize": "حجم الأسطوانة",
"department" : "القسم",
"httpError": "خطأ فشل الطلب",
"tryAgain": "أعد المحاولة",
"destinationSite" : "موقع الوجهة",
"add": "أضف",
"site" : "الموقع",
"onlyNumbers": "يسمح بإدخال الأرقام فقط",
"youHaveToSelect": "يجب عليك إختيار",
"building" : "المبنى",
"floor" : "الطابق",
"youHaveToAddRequests": "يجب إضافة طلبات",
"createdSuccessfully": "إكتمل الطلب بنجاح",
"failedToCompleteRequest": "فشل إتمام الطلب",
"assetNo": "رقم الجهاز",
"manufacture": "صناعة",
"model" : "الطراز",
"Serial No": "الرقم التسلسلي",
"device" : "الجهاز",
"pickAsset" : "إختر جهاز",
"filter" : "تصنيف",
"pickAsset": "إختر جهاز",
"filter": "تصفية",
"firstAction": "الإجراء الأول",
"priority": "أولوية الطلب",
"equipmentStatus": "حالة المعدات",
"jopStatus": "حالة الوظيفة",
"attachImage" : "إرفاق صورة",
"callComments": "تعليقات الطلب",
"comments": "تعليقات",
"recordVoice": "تسجيل صوت",
"gasRefillDetails": "تفاصيل اعادة تعبئة غاز",
"updateRequest": "تعديل الطلب",
"gasRefill": "اعادة تعبئة غاز",
"recordVoice" : "تسجيل صوت",
"receiverName": "اسم المستلم",
"receiverDetails" : "تفاصيل المستلم",
"receiverDetails": "تفاصيل المستقبل",
"requestedThrough": "الطلب عبر",
"typeOfRequest": "نوع الطلب",
"assetDetails": "تفاصيل الجهاز",
@ -396,8 +382,6 @@
"deviceTransferDetails": "تفاصيل نقل جهاز ",
"transferDetails": "تفاصيل النقل",
"senderDetails": "تفاصيل المرسل",
"receiverDetails" : "تفاصيل المستقبل",
"assetDetails" : "تفاصيل الجهاز",
"searchBy": "إبحث بـ",
"searchByDesc": "إبحث بأي من المعايير التالية",
"location": "الموقع",
@ -407,7 +391,6 @@
"snNumber": "الرقم التسلسلي",
"snNo": "الرقم التسلسلي",
"oracleCode": "رمز اوراكل",
"filter" : "تصفية",
"byDepartment": "حسب القسم",
"bySite": "حسب الموقع",
"applyFilter": "تصفية",
@ -486,7 +469,6 @@
"total": "مجموع",
"allRequests": "كل الطلبات",
"allWorkOrder": "جميع أوامر العمل",
"correctiveMaintenance": "الصيانة التصحيحية",
"allWorkOrders": "جميع أوامر العمل",
"requestStatus": "حالة الطلب",
"createSubWorkOrder": "إنشاء أمر عمل فرعي",
@ -502,7 +484,7 @@
"source": "المصدر",
"costCodeName": "اسم رمز التكلفة",
"installationDate": "تاريخ التثبيت",
"nextPmDate" : "موعد الزيارة الوقائية التالية",
"nextPmDate": "تاريخ الصيانة الوقائية التالي",
"lastPmDate": "موعد الزيارة الوقائية الأخيرة",
"assetScan": "مسح الجهاز",
"pickManually": "اختر يدويا",
@ -517,7 +499,6 @@
"pleaseEnterTheOtpSentTo": "يرجى إدخال OTP المرسل إلى",
"resetPassword": "إعادة تعيين كلمة المرور",
"pleaseEnterTheNewPassword": "يرجى إدخال كلمة المرور الجديدة",
"verify": "تحقق",
"employeeIdIsRequired": "رقم الموظف مطلوب",
"youHaveSuccessfullyMarkedYourAttendance": "لقد قمت بتسجيل حضورك بنجاح",
"markAttendance": "تسجيل الحضور",
@ -530,7 +511,6 @@
"createdDate": "تاريخ الإنشاء",
"employeeId": "رقم الموظف",
"extensionNo": "رقم التمديد",
"checkIn": "تسجيل الدخول",
"pmWo": "أمر العمل الوقائي",
"taskNo": "رقم المهمة",
"assignEngineer": "تعيين مهندس",
@ -540,7 +520,6 @@
"fail": "فشل",
"pass": "نجاح",
"pmPlanNo": "رقم خطة الصيانة الوقائية",
"nextPmDate": "تاريخ الصيانة الوقائية التالي",
"executionTimeFrame": "إطار زمني للتنفيذ",
"pmTestResult": "نتيجة اختبار الصيانة الوقائية",
"actualVisit": "الزيارة الفعلية",
@ -563,13 +542,10 @@
"acknowledge": "إقرار",
"transferAsset": "نقل الأصل",
"createAssetTransferRequest": "إنشاء طلب نقل أصل",
"arrivedDate": "تاريخ الوصول",
"closedDate": "تاريخ الإغلاق",
"since": "منذ",
"rejectionDetails": "تفاصيل الرفض",
"part": "جزء",
"closedDate": "تاريخ الإغلاق",
"creationDate": "تاريخ الإنشاء"
}

@ -102,7 +102,7 @@
"createServiceRequest": "Create Service Request",
"delete": "Delete",
"details": "Details",
"device": "Asset",
"device": "Device",
"deviceArName": "Asset Ar Name",
"sparePartDetails": "Spare Part Details",
"attachQuotation": "Attach Quotation",
@ -271,7 +271,6 @@
"signInToYour": "Sign in to your",
"account": "account",
"forgotPassword": "Forgot Password?",
"password" : "Password",
"username": "Username",
"requiredField": "Required Field",
"passwordLengthMessage": "Password must has at least 6 characters",
@ -302,36 +301,25 @@
"gasRefillRequest": "Gas Refill Request",
"transferRequest": "Transfer Request",
"serviceRequest": "Service Request",
"newServiceRequest" : "New Service Request",
"newGasRefillRequest": "New Gas Refill Request",
"newTransferRequest": "New Transfer Request",
"submitRequest": "Submit Request",
"select": "Select",
"gasType": "Gas Type",
"quantity" : "Quantity",
"cylinderType": "Cylinder Type",
"cylinderSize": "Cylinder Size",
"department" : "Department",
"httpError": "Error Request Failed",
"tryAgain": "Try Again",
"destinationSite" : "Destination Site",
"add": "Add",
"site" : "Site",
"onlyNumbers": "Only Numbers Allowed",
"youHaveToSelect": "You have to select",
"building" : "Building",
"floor" : "Floor",
"youHaveToAddRequests": "You have to add requests",
"createdSuccessfully": "Created successfully",
"failedToCompleteRequest": "Failed to complete request",
"assetNo": "Asset No.",
"manufacture": "Manufacture",
"model" : "Model",
"serialNo": "Serial No",
"device" : "Device",
"pickAsset": "Pick Asset",
"filter": "Filter",
"pickAsset" : "Pick Asset",
"firstAction": "First Action",
"rejectionReason": "Rejection Reason",
"workOrder": "Work Order",
@ -366,26 +354,22 @@
"markAsCompleted": "Mark As Completed",
"cmNumber": "CM Number",
"jopStatus": "Jop Status",
"attachImage" : "Attach Image",
"callComments": "Call Comments",
"comments": "Comments",
"recordVoice": "Record Voice",
"gasRefillDetails": "Gas Refill Details",
"updateRequest": "Update Request",
"gasRefill": "Gas Refill",
"recordVoice" : "Record Voice",
"assetDetails": "Asset Details",
"receiverName": "Receiver Name",
"receiverDetails": "Receiver Details",
"requestedThrough": "Requested Through",
"typeOfRequest": "Type of Request",
"deviceTransfer": "Device Transfer",
"deviceTransferRequest" : "Device Transfer Request",
"deviceTransferRequest": "Device Transfer Requests",
"deviceTransferDetails": "Device Transfer Details",
"transferDetails": "Transfer Details",
"senderDetails": "Sender Details",
"receiverDetails" :"Receiver Details",
"typeOfRequest" : "Type of Request",
"searchBy": "Search by",
"searchByDesc": "Search by any of the following criteria",
"location": "Location",
@ -395,7 +379,6 @@
"snNumber": "SN Number",
"snNo": "SN No.",
"oracleCode": "Oracle Code",
"filter" : "Filter",
"byDepartment": "By Department",
"bySite": "By Site",
"applyFilter": "Apply Filter",
@ -442,7 +425,6 @@
"newRequests": "New",
"completed": "Completed",
"overdue": "Overdue",
"highPriority" : "High Priority",
"lowPriority": "Low Priority",
"newR": "New",
"inProgress": "In Progress",
@ -465,7 +447,6 @@
"addItem": "Add Item",
"item": "Item",
"measuredValue": "Measured Value",
"overdue": "Overdue",
"sureExit": "Are you sure ypu want to Exit? ",
"daily": "Daily",
"weekly": "Weekly",
@ -478,18 +459,15 @@
"requestGasRefill": "Request Gas Refill",
"trackGasRefill": "Track Gas Refill",
"trackAssetTransfer": "Track Asset Transfer",
"deviceTransferRequest" : "Device Transfer Requests",
"total": "Total",
"noDataFound": "No Data Found",
"allRequests": "All Requests",
"allWorkOrder": "All Work Order",
"allWorkOrder": "All Work Orders",
"requestStatus": "Request Status",
"createSubWorkOrder": "Create Sub Work Order",
"mrNumber": "MR Number",
"vendorEng": "Vendor Engineer",
"allWorkOrder": "All Work Orders",
"vendorName": "Vendor Name",
"correctiveMaintenance": "Corrective Maintenance",
"reset": "Reset",
"solution": "Solution",
"technicalComment": "Technical Comment",
@ -522,7 +500,6 @@
"pleaseEnterTheNewPassword": "Please enter the new password",
"markAttendance": "Mark Attendance",
"selectMethodToMarkAttendance": "Select the method to mark the attendance",
"verify": "Verify",
"employeeIdIsRequired": "Employee Id is required",
"successful": "Successful",
"youHaveSuccessfullyMarkedYourAttendance": "You have successfully marked your attendance",
@ -543,7 +520,6 @@
"fail": "FAIL",
"pass": "PASS",
"pmPlanNo": "PM Plan No",
"nextPmDate": "Next PM Date",
"executionTimeFrame": "Execution Time Frame",
"pmTestResult": "PM Test Result",
"actualVisit": "Actual Visit",
@ -566,12 +542,10 @@
"acknowledge": "Acknowledge",
"transferAsset": "Transfer Asset",
"createAssetTransferRequest": "Create Asset Transfer Request",
"telephone": "Telephone",
"arrivedDate": "Arrived Date",
"closedDate": "Closed Date",
"since": "Since",
"rejectionDetails": "Rejection Details",
"part": "Part",
"closedDate": "Closed Date",
"creationDate": "Creation Date"
}

@ -2,13 +2,11 @@ import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/models/enums/user_types.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/pages/new_gas_refill_request_page.dart';
import 'package:test_sa/service_request_latest/views/nurse/create_new_request_view.dart';
import 'package:test_sa/views/pages/device_transfer/request_device_transfer.dart';
import 'package:test_sa/views/pages/user/tasks_request/create_task_view.dart';
import 'package:test_sa/views/pages/device_transfer/create__asset_transfer_request.dart';
import 'package:test_sa/views/pages/user/tasks_request/create_task_view.dart';
class CreateRequestTypeBottomSheet extends StatelessWidget {
final bool isEngineer;

@ -24,7 +24,7 @@ class AssetPicker extends StatelessWidget {
final bool showLoading;
final bool multiSelection;
const AssetPicker(
AssetPicker(
{Key? key,
this.editable = true,
this.device,

Loading…
Cancel
Save