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

Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes

Browse Source 
# Conflicts:
#	lib/controllers/api_routes/urls.dart
design_3.0_task_module_new
WaseemAbbasi22 5 months ago
parent 8ae51480f9 6d4b57db01
commit 69d10c50de
10 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File

6
lib/controllers/api_routes/urls.dart
Unescape Escape View File

@ -7,10 +7,10 @@ class URLs {
// static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
// static String _baseUrl = "$_host/mobile";
static String _baseUrl = "$_host/mobile";
// static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
static final String _baseUrl = "$_host/mobile"; // host local UAT
// static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
// static final String _baseUrl = "$_host/mobile"; // host local UAT
// static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM
static String _host = host1;

3
lib/extensions/context_extension.dart
Unescape Escape View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
import '../controllers/providers/settings/setting_provider.dart';
@ -16,7 +17,7 @@ extension BuildContextExtension on BuildContext {
bool get isAr => Provider.of<SettingProvider>(this).language == "ar";
SettingProvider get settingProvider => Provider.of<SettingProvider>(this, listen: false);
// UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog(
context: this,

14
lib/main.dart
Unescape Escape View File

@ -97,16 +97,16 @@ import 'new_views/pages/gas_refill_request_form.dart';
import 'providers/service_request_providers/loan_availability_provider.dart';
import 'providers/service_request_providers/reject_reason_provider.dart';
class MyHttpOverrides extends HttpOverrides {
@override
HttpClient createHttpClient(SecurityContext? context) {
return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
}
}
// class MyHttpOverrides extends HttpOverrides {
// @override
// HttpClient createHttpClient(SecurityContext? context) {
// return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
// }
// }
void main() async {
WidgetsFlutterBinding.ensureInitialized();
HttpOverrides.global = MyHttpOverrides(); // for later use.
// HttpOverrides.global = MyHttpOverrides(); // for later use.
_configureLocalTimeZone();
NotificationManger.initialisation((notificationDetails) {}, (id, title, body, payload) async {});

2
lib/models/new_models/gas_refill_model.dart
Unescape Escape View File

@ -123,10 +123,8 @@ class GasRefillModel {
json['gasRefillContactPerson'].forEach((v) {
gasRefillContactPerson?.add(GasRefillContactPerson.fromJson(v));
});
}
// try {
// final DateTime? sd = DateTime.tryParse(startDate ?? "");
// final DateTime? st = DateTime.tryParse(startTime ?? "");

18
lib/modules/cm_module/views/components/service_request_detail_view.dart
Unescape Escape View File

@ -68,8 +68,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
initialVisitCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
assetDetailCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
12.height,
costCard(context, requestProvider),
12.height,
if (context.userProvider.user!.type == UsersTypes.engineer) ...[
costCard(context, requestProvider),
12.height,
],
contactInfoCard(context, requestProvider.currentWorkOrder!.data!),
20.height,
],
@ -120,7 +122,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
),
8.width,
],
if(workOrder.itgFormWorkOrderStatus!=null)...[
if (workOrder.itgFormWorkOrderStatus != null) ...[
StatusLabel(
label: workOrder.itgFormWorkOrderStatus,
id: 0,
@ -470,12 +472,12 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
// Text(
// 'Spare Part Cost: ${provider.currentWorkOrder!.data?.sparePartCost ?? '-'}',
// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
// ),
Text(
'Spare Part Cost: ${provider.currentWorkOrder!.data?.sparePartCost ?? '-'}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
),
Text(
'Labour Cost: ${provider.currentWorkOrder!.data?.labourCost ?? '-'}',
'Labor Cost: ${provider.currentWorkOrder!.data?.labourCost ?? '-'}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
),
Text(

30
lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
Unescape Escape View File

@ -66,22 +66,22 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
// AppTextFormField(
// labelText: "Spare Part Cost",
// backgroundColor: AppColor.neutral100,
// initialValue: requestDetailProvider.workOrderCostModel?.sparePartCost?.toString(),
// textAlign: TextAlign.center,
// labelStyle: AppTextStyles.textFieldLabelStyle,
// textInputType: TextInputType.number,
// showShadow: false,
// onChange: (value) {
// requestDetailProvider.workOrderCostModel?.sparePartCost = num.parse(value);
// },
// style: Theme.of(context).textTheme.titleMedium,
// ),
// 8.height,
AppTextFormField(
labelText: "Spare Part Cost",
backgroundColor: AppColor.neutral100,
initialValue: requestDetailProvider.workOrderCostModel?.sparePartCost?.toString(),
textAlign: TextAlign.center,
labelStyle: AppTextStyles.textFieldLabelStyle,
textInputType: TextInputType.number,
showShadow: false,
onChange: (value) {
requestDetailProvider.workOrderCostModel?.sparePartCost = num.parse(value);
},
style: Theme.of(context).textTheme.titleMedium,
),
8.height,
AppTextFormField(
labelText: "Labour Cost",
labelText: "Labor Cost",
backgroundColor: AppColor.neutral100,
initialValue: requestDetailProvider.workOrderCostModel?.labourCost?.toString(),
textAlign: TextAlign.center,

28
lib/new_views/pages/land_page/requests/device_item_view.dart
Unescape Escape View File

@ -29,13 +29,13 @@ class DeviceItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (requestData!.priorityName != null)
StatusLabel(
label: requestData!.priorityName ?? "",
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
// if (requestData!.priorityName != null)
// StatusLabel(
// label: requestData!.priorityName ?? "",
// textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
// ),
// 8.width,
if (requestData?.statusName != null)
StatusLabel(
label: requestData?.statusName ?? "",
@ -89,13 +89,13 @@ class DeviceItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (requestDetails!.priority != null)
StatusLabel(
label: requestDetails!.priority ?? "",
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
8.width,
// if (requestDetails!.priority != null)
// StatusLabel(
// label: requestDetails!.priority ?? "",
// textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
// ),
// 8.width,
if (requestDetails?.status != null)
StatusLabel(
label: requestDetails?.status ?? "",

24
lib/new_views/pages/land_page/requests/gas_refill_item_view.dart
Unescape Escape View File

@ -30,12 +30,12 @@ class GasRefillItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
// StatusLabel(
// label: requestData!.priorityName!,
// textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
// ),
// 8.width,
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
@ -90,12 +90,12 @@ class GasRefillItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestDetails!.priority!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
8.width,
// StatusLabel(
// label: requestDetails!.priority!,
// textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
// ),
// 8.width,
StatusLabel(
label: requestDetails!.status!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status!),

24
lib/new_views/pages/land_page/requests/ppm_item_view.dart
Unescape Escape View File

@ -26,12 +26,12 @@ class PpmItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
// StatusLabel(
// label: requestData!.priorityName!,
// textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
// ),
// 8.width,
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
@ -77,12 +77,12 @@ class PpmItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestDetails!.priority!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
8.width,
// StatusLabel(
// label: requestDetails!.priority!,
// textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
// ),
// 8.width,
StatusLabel(
label: requestDetails!.status!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status!),

15
lib/views/pages/user/gas_refill/gas_refill_details.dart
Unescape Escape View File

@ -11,7 +11,6 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/pages/gas_refill_request_form.dart';
import 'package:test_sa/views/pages/user/gas_refill/update_gas_refill_request.dart';
import 'package:test_sa/views/widgets/images/files_list.dart';
import 'package:test_sa/views/widgets/loaders/app_loading.dart';
@ -120,13 +119,13 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
children: [
Row(
children: [
if (widget.priority != null)
StatusLabel(
label: widget.priority,
textColor: AppColor.getRequestStatusTextColorByName(context, widget.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, widget.priority!),
),
8.width,
// if (widget.priority != null)
// StatusLabel(
// label: widget.priority,
// textColor: AppColor.getRequestStatusTextColorByName(context, widget.priority!),
// backgroundColor: AppColor.getRequestStatusColorByName(context, widget.priority!),
// ),
// 8.width,
StatusLabel(
label: gasRefillModel.status?.name ?? "",
textColor: AppColor.getRequestStatusTextColorByName(context, gasRefillModel.status?.name ?? ""),

Write Preview
Loading…
Cancel
Save