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

improvements

Browse Source
main_production_asset_tracking
Sikander Saleem 3 weeks ago
parent 9575941755
commit 849ef0f50b
1 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File

85
lib/modules/asset_tracking/map_tracking_page.dart
Unescape Escape View File

@ -125,9 +125,9 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
provider.coordinates = []; provider.coordinates = [];
provider.assetsOnTheFloorList = []; provider.assetsOnTheFloorList = [];
provider.notify(); provider.notify();
Utils.showLoading(context);
provider.getAssetsFromPenguinByFloor(); await provider.getAssetsFromPenguinByFloor();
Utils.hideLoading(context);
if (provider.selectedFloor != null) { if (provider.selectedFloor != null) {
getFloorMap(provider.selectedFloor!.id!); getFloorMap(provider.selectedFloor!.id!);
provider.getZoneFromPenguin(); provider.getZoneFromPenguin();
@ -481,9 +481,6 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
); );
}, },
), ),
// if (!inAppView || )
if (markers.isNotEmpty) MarkerLayer(markers: markers),
], ],
if (inAppView && _geojson == null) if (inAppView && _geojson == null)
Selector<AssetTrackingProvider, List<Coordinates>>( Selector<AssetTrackingProvider, List<Coordinates>>(
@ -503,19 +500,64 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
_lastFittedCoordinatesKey = key; _lastFittedCoordinatesKey = key;
_fitCameraToPoints(list); _fitCameraToPoints(list);
} }
List<Polygon> zonesPolygons = [ final buildingLabel = assetTrackingProvider.selectedBuilding?.label ?? "";
Polygon(
label: assetTrackingProvider.selectedBuilding?.label ?? "", // Assets fetched without floorIds => all assets of the selected building.
labelStyle: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context)), return Selector<AssetTrackingProvider, List<AssetTrackingModel>>(
points: list, selector: (_, provider) => List<AssetTrackingModel>.of(provider.assetsOnTheFloorList),
color: AppColor.red30.withOpacity(0.3), builder: (_, buildingAssets, __) {
borderColor: AppColor.red30, final zone = GeoZone(
borderStrokeWidth: 2.0, properties: {'name': buildingLabel.isEmpty ? "Building" : buildingLabel},
), points: list,
]; assets: buildingAssets,
return PolygonLayer(polygons: zonesPolygons, hitNotifier: _polygonHitNotifier); );
final buildingPolygon = Polygon<Object>(
label: buildingLabel,
labelStyle: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context)),
labelPlacementCalculator: const PolygonLabelPlacementCalculator.simpleCentroid(),
points: list,
color: AppColor.red30.withOpacity(0.3),
borderColor: AppColor.red30,
borderStrokeWidth: 2.0,
hitValue: zone,
);
return Stack(
children: [
GestureDetector(
onTap: _onFeatureTapped,
child: PolygonLayer(polygons: [buildingPolygon], hitNotifier: _polygonHitNotifier),
),
// Hide the count badge while asset pins are shown (same as floor view).
if (buildingAssets.isNotEmpty && markers.isEmpty)
MarkerLayer(
markers: [
Marker(
point: buildingPolygon.labelPosition,
width: 21,
height: 33,
// Sit the badge just above the building label so they don't overlap.
alignment: Alignment.topCenter,
child: Padding(
padding: const EdgeInsets.only(bottom: 12),
child: GestureDetector(
onTap: () => _showZoneDetails(zone),
child: _ZoneCountBadge(count: buildingAssets.length),
),
),
),
],
),
],
);
},
);
}), }),
if (_geojson != null && inAppView) // Selected asset pins (floor map or building outline).
if (markers.isNotEmpty) MarkerLayer(markers: markers),
// Assets panel: shown for both floor view and building-only view.
if (inAppView)
Positioned( Positioned(
bottom: 0, bottom: 0,
left: 0, left: 0,
@ -523,6 +565,7 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
child: Selector<AssetTrackingProvider, List<AssetTrackingModel>>( child: Selector<AssetTrackingProvider, List<AssetTrackingModel>>(
selector: (_, myModel) => myModel.assetsOnTheFloorList, selector: (_, myModel) => myModel.assetsOnTheFloorList,
builder: (_, assetsOnTheFloorList, __) { builder: (_, assetsOnTheFloorList, __) {
final scope = _geojson != null ? "Floor" : "Building";
return assetsOnTheFloorList.isEmpty return assetsOnTheFloorList.isEmpty
? const SizedBox() ? const SizedBox()
: Container( : Container(
@ -533,12 +576,12 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
border: Border.all(color: AppColor.tabBarBorder(context)), border: Border.all(color: AppColor.tabBarBorder(context)),
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: UpwardExpansionTile(title: InfoTextLabelWidget(label: "${assetsOnTheFloorList.length} Assets found on this floor"), children: [ child: UpwardExpansionTile(title: InfoTextLabelWidget(label: "${assetsOnTheFloorList.length} Assets found on this ${scope.toLowerCase()}"), children: [
LimitedBox( LimitedBox(
maxHeight: 120, maxHeight: 120,
child: MultipleItemDropDownMenu<AssetTrackingModel, NullableLoadingProvider>( child: MultipleItemDropDownMenu<AssetTrackingModel, NullableLoadingProvider>(
context: context, context: context,
title: 'Assets on The Floor', title: 'Assets on The $scope',
hintMsg: 'Search By Label or Serial Number', hintMsg: 'Search By Label or Serial Number',
initialValue: [], initialValue: [],
showShadow: false, showShadow: false,
@ -694,6 +737,8 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
label: "View", label: "View",
disableButton: assetProvider.selectedSite == null || assetProvider.selectedBuilding == null, disableButton: assetProvider.selectedSite == null || assetProvider.selectedBuilding == null,
onPressed: () { onPressed: () {
_onViewPressed(assetTrackingProvider);
return;
expansibleController.collapse(); expansibleController.collapse();
assetTrackingProvider.coordinates.clear(); assetTrackingProvider.coordinates.clear();
assetTrackingProvider.assetsOnTheFloorList.clear(); assetTrackingProvider.assetsOnTheFloorList.clear();

Write Preview
Loading…
Cancel
Save