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

some edits

Browse Source
pull/2/head
nextwo 2 years ago
parent 575005ebdd
commit c58a86758c
10 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File

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

@ -74,10 +74,9 @@
"details": "تفاصيل",
"device": "جهاز",
"deviceArName": "اسم الجهاز بعربي",
"deviceEnName": "اسم الجهاز بالانجليزية",
"deviceName": "اسم الجهاز",
"deviceImages": "صور الجهاز",
"deviceModel": "مركة الجهاز",
"deviceName": "اسم الجهاز",
"deviceRequired": "الجهاز مطلوب",
"deviceSN": "رقم تسلسلي للجهاز",
"engineerName": "اسم المهندس",
@ -182,7 +181,7 @@
"reportType": "نوع التقرير",
"callId": "رقم الطلب",
"requiredWord": "مطلوب",
"serviceType": "نوع الخدمة",
"AssetType": "نوع الاصل",
"workPreformed": "العمل المنجز",
"alert": "تنبيه",
"duplicateAlert": "تنبيه التكرار",

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

@ -73,10 +73,9 @@
"details": "Details",
"device": "Asset",
"deviceArName": "Asset Ar Name",
"deviceEnName": "Asset En Name",
"deviceName": "Asset Name",
"deviceImages": "Asset Images",
"deviceModel": "Asset Model",
"deviceName": "Asset Name",
"deviceRequired": "Asset Required",
"deviceSN": "Asset SN",
"engineerName": "Engineer Name",
@ -181,7 +180,7 @@
"reportType": "Report Type",
"callId": "Call Id",
"requiredWord": "required",
"serviceType": "Service Type",
"AssetType": "asset type",
"workPreformed": "Work Preformed",
"orderWorkNumber": "Order Work Number",
"assignedEmployee": "Assigned Employee",

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

@ -112,7 +112,6 @@ class Subtitle {
String unite;
String unitRequired;
String deviceArName;
String deviceEnName;
String details;
String general;
String serviceRequestInformation;
@ -197,7 +196,7 @@ class Subtitle {
String customer;
String reportType;
String requiredWord;
String serviceType;
String AssetType;
String reportStatus;
String callLastSituation;
String invoiceNumber;
@ -352,7 +351,6 @@ class Subtitle {
@required this.twitter,
@required this.add,
@required this.code,
@required this.deviceEnName,
@required this.deviceName,
@required this.serialNumber,
@required this.policy,
@ -424,7 +422,7 @@ class Subtitle {
@required this.reasons,
@required this.reportStatus,
@required this.reportType,
@required this.serviceType,
@required this.AssetType,
@required this.workPreformed,
@required this.alert,
@required this.duplicateAlert,
@ -522,7 +520,6 @@ class Subtitle {
details: parsedJson["details"],
device: parsedJson["device"],
deviceArName: parsedJson["deviceArName"],
deviceEnName: parsedJson["deviceEnName"],
deviceImages: parsedJson["deviceImages"],
deviceModel: parsedJson["deviceModel"],
deviceName: parsedJson["deviceName"],
@ -629,7 +626,7 @@ class Subtitle {
reportType: parsedJson["reportType"],
callId: parsedJson["callId"],
requiredWord: parsedJson["requiredWord"],
serviceType: parsedJson["serviceType"],
AssetType: parsedJson["serviceType"],
workPreformed: parsedJson["workPreformed"],
alert: parsedJson["alert"],
duplicateAlert: parsedJson["duplicateAlert"],

4
lib/models/visits/visit.dart
Unescape Escape View File

@ -61,8 +61,8 @@ class Visit {
deviceSerialNumber: parsedJson["assetSerialNo"],
deviceEnglishName: parsedJson["assetName"],
deviceArabicName: parsedJson["assetName"],
employId: parsedJson["assignedToId"].toString(),
employName: parsedJson["assignedToName"],
employId: parsedJson["assignedEmployeeId"].toString(),
employName: parsedJson["assignedEmployeeName"],
expectDate: parsedJson["expectedDate"].toString().split("T").first,
actualDate: parsedJson["actualDate"].toString().split("T").first,
modelAndBrand: "${parsedJson["modelName"]} / ${parsedJson["manufacturerName"]}",

2
lib/views/pages/sub_workorder/search_sub_workorder_page.dart
Unescape Escape View File

@ -76,7 +76,7 @@ class _SearchSubWorkOrderPageState extends State<SearchSubWorkOrderPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ATextFormField(
labelText: "Caller ID",
labelText: "Call ID",
onSaved: (value) {
_callerId = value;
},

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

@ -284,7 +284,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
const SizedBox(
height: 8,
),
ASubTitle(_subtitle.serviceType),
ASubTitle(_subtitle.AssetType),
_validate && _serviceReport.assetType == null
? ASubTitle(
_subtitle.requiredWord,
@ -323,7 +323,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
const SizedBox(
height: 8,
),
// Report status and Service Type
// Report status and Asset Type
Row(
children: [
// report status
@ -510,7 +510,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
),
),
// Report status and Service Type
// Report status and Asset Type
if (_showCommentField)
const SizedBox(

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

@ -242,7 +242,7 @@ class _EditServiceReportState extends State<EditServiceReport> with TickerProvid
const SizedBox(
height: 8,
),
ASubTitle(_subtitle.serviceType),
ASubTitle(_subtitle.AssetType),
_validate && _serviceReport.assetType == null
? ASubTitle(
_subtitle.requiredWord,
@ -286,7 +286,7 @@ class _EditServiceReportState extends State<EditServiceReport> with TickerProvid
const SizedBox(
height: 8,
),
// Report status and Service Type
// Report status and Asset Type
Row(
children: [
// report status

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

@ -247,7 +247,7 @@ class RequestDetailsPage extends StatelessWidget {
// content: serviceRequest.deviceArName,
// ),
RequestInfoRow(
title: _subtitle.deviceEnName,
title: _subtitle.deviceName,
content: serviceRequest.deviceEnName,
),
RequestInfoRow(
@ -420,7 +420,7 @@ class RequestDetailsPage extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(32),
child: AButton(
text: "Create Report",
text: "Create Work Order",
onPressed: () {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => CreateServiceReport(request: serviceRequest)));
},

11
lib/views/pages/user/visits/visit_details.dart
Unescape Escape View File

@ -14,6 +14,8 @@ import 'package:test_sa/views/widgets/requests/info_row.dart';
import 'package:test_sa/views/widgets/visits/visit_status.dart';
import '../../../../controllers/providers/api/regular_visits_provider.dart';
import '../../../../controllers/providers/api/user_provider.dart';
import '../../../../models/enums/user_types.dart';
class VisitDetailsPage extends StatelessWidget {
static final String id = "/visit-details";
@ -24,6 +26,8 @@ class VisitDetailsPage extends StatelessWidget {
Widget build(BuildContext context) {
Subtitle _subtitle = AppLocalization.of(context).subtitle;
final regularVisitsProvider = Provider.of<RegularVisitsProvider>(context);
UserProvider _userProvider = Provider.of<UserProvider>(context);
return Scaffold(
body: SafeArea(
child: Column(
@ -42,6 +46,7 @@ class VisitDetailsPage extends StatelessWidget {
),
),
),
if (_userProvider?.user?.type == UsersTypes.engineer)
AIconButton(
iconData: Icons.edit,
color: AColors.white,
@ -152,11 +157,7 @@ class VisitDetailsPage extends StatelessWidget {
content: visit.hospitalName,
),
RequestInfoRow(
title: _subtitle.deviceArName,
content: visit.deviceArabicName,
),
RequestInfoRow(
title: _subtitle.deviceEnName,
title: _subtitle.deviceName,
content: visit.deviceEnglishName,
),
],

8
lib/views/widgets/equipment/single_device_picker.dart
Unescape Escape View File

@ -90,8 +90,8 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
child: Column(
children: [
ATextFormField(
hintText: _subtitle.searchBySn,
controller: snController,
hintText: "Search by Asset Number",
controller: numberController,
style: Theme.of(context).textTheme.subtitle1,
suffixIcon: const Icon(Icons.search_rounded),
textInputAction: TextInputAction.search,
@ -107,8 +107,8 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
height: 8,
),
ATextFormField(
hintText: "Search by Number",
controller: numberController,
hintText: _subtitle.searchBySn,
controller: snController,
style: Theme.of(context).textTheme.subtitle1,
suffixIcon: const Icon(Icons.search_rounded),
textInputAction: TextInputAction.search,

Write Preview
Loading…
Cancel
Save