Merge pull request #55 from pvdthings/fix-ppl-items

Fix: Handle Items at PPL Location

Author: dillonfagan

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pvdthings-api",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "",
   "main": "server.js",
   "scripts": {

apps/api/services/inventory/mapItem.js

@@ -15,6 +15,7 @@ function mapItem(record) {
       estimatedValue: record.get('Estimated Value'),
       eyeProtection: Boolean(record.get('Eye Protection')),
       condition: record.get('Condition'),
+      location: record.get('Location')?.[0],
       totalLoans: record.get('Total Loans'),
       images: record.get('Picture')?.map(image => image.thumbnails.large.url) || [],
       manuals: record.get('Manuals')?.map(manual => ({

apps/api/services/inventory/service.js

@@ -10,6 +10,7 @@ const inventoryFields = [
   'Eye Protection',
   'Active Loans', 
   'Total Loans',
+  'Location',
   'Manuals',
   'Picture', 
   'Hidden', 

apps/librarian/lib/core/api/models/item_model.dart

@@ -15,6 +15,7 @@ class ItemModel {
     this.condition,
     this.description,
     this.estimatedValue,
+    this.location,
   });
 
   final String id;
@@ -23,6 +24,7 @@ class ItemModel {
   final String? description;
   final String? brand;
   final String? condition;
+  final String? location;
   final double? estimatedValue;
   final bool available;
   final bool hidden;
@@ -42,6 +44,7 @@ class ItemModel {
       totalLoans: json['totalLoans'] as int,
       brand: json['brand'] as String?,
       condition: json['condition'] as String?,
+      location: json['location'] as String?,
       estimatedValue: json['estimatedValue'] as double?,
       eyeProtection: json['eyeProtection'] as bool,
       imageUrls: (json['images'] as List).cast<String>(),

apps/librarian/lib/modules/things/details/inventory/icons.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:librarian_app/core/api/models/item_model.dart';
+
+const checkedInIcon = Tooltip(
+  message: 'Available',
+  child: Icon(Icons.circle, color: Colors.green, size: 16),
+);
+
+const checkedOutIcon = Tooltip(
+  message: 'Unavailable',
+  child: Icon(Icons.circle, color: Colors.amber, size: 16),
+);
+
+const partnerLocationIcon = Tooltip(
+  message: 'Partner Location',
+  child: Icon(Icons.circle, color: Colors.grey, size: 16),
+);
+
+const hiddenIcon = Tooltip(
+  message: 'Hidden',
+  child: Icon(Icons.circle, color: Colors.red, size: 16),
+);
+
+Widget getIcon(ItemModel item) {
+  if (item.hidden) {
+    return hiddenIcon;
+  }
+
+  if (item.location == 'Providence Public Library') {
+    return partnerLocationIcon;
+  }
+
+  return item.available ? checkedInIcon : checkedOutIcon;
+}

apps/librarian/lib/modules/things/details/inventory/item_details_drawer/drawer.dart renamed to apps/librarian/lib/modules/things/details/inventory/item_details/drawer.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:librarian_app/modules/things/details/inventory/icons.dart';
 import 'package:librarian_app/modules/things/details/inventory/item_details/item_details_controller.dart';
 import 'package:librarian_app/widgets/filled_progress_button.dart';
 
-import '../item_details/item_details.dart';
+import 'item_details.dart';
 
 class ItemDetailsDrawer extends StatefulWidget {
   const ItemDetailsDrawer({
@@ -38,11 +39,14 @@ class _ItemDetailsDrawerState extends State<ItemDetailsDrawer> {
               Padding(
                 padding: const EdgeInsets.all(16),
                 child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    Text(
-                      '#${widget.controller.item!.number}',
-                      style: Theme.of(context).textTheme.titleLarge,
+                    getIcon(widget.controller.item!),
+                    const SizedBox(width: 8.0),
+                    Expanded(
+                      child: Text(
+                        '#${widget.controller.item!.number}',
+                        style: Theme.of(context).textTheme.titleLarge,
+                      ),
                     ),
                     MenuAnchor(
                       controller: menuController,

apps/librarian/lib/modules/things/details/inventory/item_details/item_details.dart

@@ -166,6 +166,15 @@ class ItemDetails extends ConsumerWidget {
                           },
                           value: controller.conditionNotifier.value,
                         ),
+                        const SizedBox(height: 16),
+                        TextFormField(
+                          decoration: const InputDecoration(
+                            labelText: 'Location',
+                          ),
+                          enabled: false,
+                          initialValue: controller.item?.location,
+                          readOnly: true,
+                        ),
                       ],
                     ),
                   ),

apps/librarian/lib/modules/things/details/inventory/item_details/item_details_dialog.dart

@@ -7,6 +7,7 @@ import 'package:librarian_app/widgets/hint_text.dart';
 
 import '../../../../core/api/models/item_model.dart';
 import '../../../../widgets/details_card/card_header.dart';
+import 'icons.dart';
 
 class ItemsCard extends ConsumerWidget {
   const ItemsCard({
@@ -104,27 +105,4 @@ class ItemsCard extends ConsumerWidget {
             ),
     );
   }
-
-  Widget getIcon(ItemModel item) {
-    if (item.hidden) {
-      return hiddenIcon;
-    }
-
-    return item.available ? checkedInIcon : checkedOutIcon;
-  }
 }
-
-const checkedInIcon = Tooltip(
-  message: 'Available',
-  child: Icon(Icons.circle, color: Colors.green, size: 16),
-);
-
-const checkedOutIcon = Tooltip(
-  message: 'Unavailable',
-  child: Icon(Icons.circle, color: Colors.amber, size: 16),
-);
-
-const hiddenIcon = Tooltip(
-  message: 'Hidden',
-  child: Icon(Icons.circle, color: Colors.red, size: 16),
-);

apps/librarian/lib/modules/things/details/inventory/items_card.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:librarian_app/dashboard/providers/end_drawer_provider.dart';
 import 'package:librarian_app/modules/things/details/inventory/create_items/create_items_dialog.dart';
-import 'package:librarian_app/modules/things/details/inventory/item_details_drawer/drawer.dart';
+import 'package:librarian_app/modules/things/details/inventory/item_details/drawer.dart';
 import 'package:librarian_app/modules/things/details/thing_details/thing_details_card.dart';
 import 'package:librarian_app/core/api/models/updated_image_model.dart';
 import 'package:librarian_app/modules/things/details/inventory/item_details_page.dart';

apps/librarian/lib/modules/things/details/inventory_details.dart

@@ -10,7 +10,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # followed by an optional build number separated by a +.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
-version: 1.0.0+14
+version: 1.0.0+15
 
 environment:
   sdk: '>=3.0.0'