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

create asset transfer, on internal & external destination values reset.

Browse Source
design_3.0_TM_Module
Sikander Saleem 2 months ago
parent 79fa949ba2
commit c1a7562e3b
6 changed files with 126 additions and 90 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,14 +3,14 @@ class URLs {
static const String appReleaseBuildNumber = "24";
static const host1 = "https://atomsm.hmg.com"; // production url
// static const host1 = "https://atomsm.hmg.com"; // production url
// static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
// static const host1 = "https://atomsmuat.hmg.com"; // local UAT 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"; // v3 for production CM,PM,TM
// static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
static String _host = host1;

1
lib/modules/cm_module/service_request_detail_provider.dart
Unescape Escape View File

@ -252,6 +252,7 @@ class ServiceRequestDetailProvider extends ChangeNotifier {
} catch (e) {
log("getWorkOrder [error] : $e");
isLoading = false;
currentWorkOrder = null;
notifyListeners();
return null;
}

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

@ -137,6 +137,11 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
children: [
Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Wrap(
// spacing: 8,
runSpacing: 8,
children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
StatusLabel(
@ -173,7 +178,8 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
backgroundColor: AppColor.orange30,
),
],
1.width.expanded,
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
@ -181,7 +187,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
// context.translation.code.toSvgAsset(width: 48).onPress(() {
// // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest)));
// }),
if (userProvider.user!.type == UsersTypes.engineer) 16.height,
// if (userProvider.user!.type == UsersTypes.engineer) 16.height,
Text(
workOrder.requestedDate!.toString().toServiceRequestCardFormat,
textAlign: TextAlign.end,
@ -191,6 +197,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
)
],
),
8.height,
Text(
context.translation.assetInformation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
@ -507,9 +514,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
).expanded,
if (!provider.isReadOnlyRequest)
"edit_icon".toSvgAsset(height: 21, width: 21,
color: context.isDark?AppColor.primary10:null
).onPress(() async {
"edit_icon".toSvgAsset(height: 21, width: 21, color: context.isDark ? AppColor.primary10 : null).onPress(() async {
provider.refreshTimer = false;
await Navigator.push(context, MaterialPageRoute(builder: (context) => CostDetailFormScreen(isEdit: true)));
provider.refreshTimer = true;

9
lib/new_views/common_widgets/single_item_drop_down_menu.dart
Unescape Escape View File

@ -16,6 +16,7 @@ class SingleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> exte
final BuildContext context;
final Function(T?)? onSelect; // Now accepts nullable values
final T? initialValue;
final T? disableValue;
final bool enabled;
final bool showAsBottomSheet;
final bool showAsFullScreenDialog;
@ -35,6 +36,7 @@ class SingleItemDropDownMenu<T extends Base, X extends LoadingListNotifier> exte
required this.context,
this.onSelect,
this.initialValue,
this.disableValue,
this.enabled = true,
this.height,
this.showAsBottomSheet = false,
@ -160,11 +162,13 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
value: value,
child: Text(
value.name ?? "", // Null-aware operator for value.name
style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500, color: context.isDark?AppColor.white10: AppColor.black10),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.white10 : AppColor.black10),
),
);
}).toList(),
).onPress(widget.showAsFullScreenDialog
).onPress(widget.enabled && widget.showAsFullScreenDialog
? () {
openDialog();
}
@ -220,6 +224,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
items: ((X == NullableLoadingProvider) ? widget.staticData : provider?.items as List<T>) ?? [],
// Provide default empty list if null
selectedItem: _selectedItem,
disableItem: widget.disableValue,
title: widget.title,
showCancel: widget.showCancel,
onSelect: (selectedT) {

28
lib/views/pages/device_transfer/create__device_transfer_request.dart
Unescape Escape View File

@ -80,7 +80,7 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
_formKey.currentState!.save();
List<AssetTransferAttachment> attachement = [];
for (var item in attachments) {
String fileName = ServiceRequestUtils.isLocalUrl(item.name??'') ? ("${item.name??''.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}") :item.name??'';
String fileName = ServiceRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? '';
attachement.add(AssetTransferAttachment(id: item.id, attachmentName: fileName));
}
_transferModel.attachments = attachement;
@ -135,19 +135,26 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
backgroundColor: AppColor.white936,
onPick: (asset) async {
_pickedAsset = asset;
if (_pickedAsset?.site != null && _transferModel.transferType?.value == 1) {
await _deviceTransferProvider.getSiteData(siteId: int.tryParse(_pickedAsset!.site!.id.toString()));
_assetDestination.site = _deviceTransferProvider.internalAssetDestination?.site;
_assetDestination.building = null;
_assetDestination.floor = null;
_assetDestination.department = null;
} else if (_pickedAsset?.site != null && _transferModel.transferType?.value == 2) {
_assetDestination.site = null;
_assetDestination.building = null;
_assetDestination.floor = null;
_assetDestination.department = null;
}
setState(() {});
}),
21.height,
requestTypeWidget(context),
12.height,
"Destination".bodyText(context).custom(color:context.isDark?Colors.white: AppColor.white936),
"Destination".bodyText(context).custom(color: context.isDark ? Colors.white : AppColor.white936),
12.height,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -156,6 +163,7 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
context: context,
title: context.translation.site,
initialValue: _assetDestination.site,
disableValue: isInternal ? null : _pickedAsset?.site,
showShadow: false,
loading: _deviceTransferProvider.isSiteLoading,
enabled: !isInternal,
@ -273,7 +281,7 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
context.translation.requestType.bodyText(context).custom(color:context.isDark?Colors.white: AppColor.white936),
context.translation.requestType.bodyText(context).custom(color: context.isDark ? Colors.white : AppColor.white936),
8.height,
Wrap(
runSpacing: 8,
@ -299,7 +307,17 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
onChanged: (state) {
_transferModel.transferType = element;
isInternal = !isInternal;
// _assetDestination = Asset();
if (isInternal) {
_assetDestination.site = _deviceTransferProvider.internalAssetDestination?.site;
_assetDestination.building = null;
_assetDestination.floor = null;
_assetDestination.department = null;
} else {
_assetDestination.site = null;
_assetDestination.building = null;
_assetDestination.floor = null;
_assetDestination.department = null;
}
setState(() {});
// });
@ -310,7 +328,7 @@ class _CreateDeviceTransferRequestState extends State<CreateDeviceTransferReques
],
)
],
).toShimmer(isShow: snapshot.loading,context: context),
).toShimmer(isShow: snapshot.loading, context: context),
],
);
});

23
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -3,26 +3,29 @@ 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/extensions/widget_extensions.dart';
import 'package:test_sa/models/base.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
typedef SelectionBuilderString = String Function(dynamic);
class SelectionFullScreenDialog<T> extends StatefulWidget {
class SelectionFullScreenDialog<T extends Base> extends StatefulWidget {
final List<T>? items;
final T? selectedItem; // Now nullable
final T? disableItem; // Now nullable
final String title;
final bool showCancel;
final SelectionBuilderString builderString;
final Function(T?) onSelect;
const SelectionFullScreenDialog({Key? key, this.items, this.selectedItem, this.title = "", required this.builderString, this.showCancel = false, required this.onSelect}) : super(key: key);
const SelectionFullScreenDialog({Key? key, this.items, this.selectedItem, this.disableItem, this.title = "", required this.builderString, this.showCancel = false, required this.onSelect})
: super(key: key);
@override
_SelectionBottomSheetState createState() => _SelectionBottomSheetState<T>();
}
class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>> {
class _SelectionBottomSheetState<T extends Base> extends State<SelectionFullScreenDialog<T>> {
T? _selectedValue; // Now nullable
String query = "";
@ -126,7 +129,9 @@ class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>>
child: ListView.builder(
itemCount: filteredList?.length,
padding: EdgeInsets.zero,
itemBuilder: (cxt, index) =>Theme(
itemBuilder: (cxt, index) {
bool isDisabledItem = widget.disableItem != null && widget.disableItem?.identifier == filteredList![index].identifier;
return Theme(
data: Theme.of(context).copyWith(
radioTheme: RadioThemeData(
fillColor: MaterialStateColor.resolveWith((states) {
@ -145,18 +150,20 @@ class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>>
groupValue: _selectedValue,
activeColor: AppColor.iconColor(context),
hoverColor: Colors.transparent,
onChanged: (value) {
onChanged: isDisabledItem
? null
: (value) {
_selectedValue = value;
searchFocusNode.unfocus();
setState(() {});
},
title: Text(
widget.builderString(filteredList![index]).cleanupWhitespace.capitalizeFirstOfEach ?? "",
style: Theme.of(context).textTheme.bodyLarge,
),
),
style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: isDisabledItem ? AppColor.neutral20:null),
),
),
);
}),
),
8.height,
if (_selectedValue != null)

Write Preview
Loading…
Cancel
Save