Krow/Krow-workspace
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #330 from Oloodi/307-fix-shift-collapse-behavior-in-order-list

Browse Source 
307 fix shift collapse behavior in order list
This commit is contained in:
José Salazar
2026-01-30 00:03:06 -05:00
committed by GitHub
parent 223c480ede 1e505c806a
commit aede5e0ab2
7 changed files with 19775 additions and 19703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md
View File

@@ -1,16 +1,16 @@
# Basic Usage
```dart
ExampleConnector.instance.getWorkforceById(getWorkforceByIdVariables).execute();
ExampleConnector.instance.getWorkforceByVendorAndStaff(getWorkforceByVendorAndStaffVariables).execute();
ExampleConnector.instance.listWorkforceByVendorId(listWorkforceByVendorIdVariables).execute();
ExampleConnector.instance.listWorkforceByStaffId(listWorkforceByStaffIdVariables).execute();
ExampleConnector.instance.getWorkforceByVendorAndNumber(getWorkforceByVendorAndNumberVariables).execute();
ExampleConnector.instance.createEmergencyContact(createEmergencyContactVariables).execute();
ExampleConnector.instance.updateEmergencyContact(updateEmergencyContactVariables).execute();
ExampleConnector.instance.deleteEmergencyContact(deleteEmergencyContactVariables).execute();
ExampleConnector.instance.listStaffAvailabilities(listStaffAvailabilitiesVariables).execute();
ExampleConnector.instance.listStaffAvailabilitiesByStaffId(listStaffAvailabilitiesByStaffIdVariables).execute();
ExampleConnector.instance.createRecentPayment(createRecentPaymentVariables).execute();
ExampleConnector.instance.updateRecentPayment(updateRecentPaymentVariables).execute();
ExampleConnector.instance.deleteRecentPayment(deleteRecentPaymentVariables).execute();
ExampleConnector.instance.CreateStaff(createStaffVariables).execute();
ExampleConnector.instance.UpdateStaff(updateStaffVariables).execute();
ExampleConnector.instance.DeleteStaff(deleteStaffVariables).execute();
ExampleConnector.instance.getStaffDocumentByKey(getStaffDocumentByKeyVariables).execute();
ExampleConnector.instance.listStaffDocumentsByStaffId(listStaffDocumentsByStaffIdVariables).execute();
ExampleConnector.instance.listStaffDocumentsByDocumentType(listStaffDocumentsByDocumentTypeVariables).execute();
ExampleConnector.instance.listStaffDocumentsByStatus(listStaffDocumentsByStatusVariables).execute();
```
@@ -23,8 +23,8 @@ Optional fields can be discovered based on classes that have `Optional` object t
This is an example of a mutation with an optional field:
```dart
await ExampleConnector.instance.listStaffCoursesByCourseId({ ... })
.offset(...)
await ExampleConnector.instance.updateAttireOption({ ... })
.itemId(...)
.execute();
```

35626
apps/mobile/packages/data_connect/lib/src/dataconnect_generated/README.md
View File

File diff suppressed because it is too large Load Diff

3714
apps/mobile/packages/data_connect/lib/src/dataconnect_generated/generated.dart
View File

File diff suppressed because it is too large Load Diff

13
apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_accepted_applications_by_business_for_day.dart
View File

@@ -106,13 +106,15 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
final String? email;
final String? phone;
final String? photoUrl;
final double? averageRating;
ListAcceptedApplicationsByBusinessForDayApplicationsStaff.fromJson(dynamic json):
id = nativeFromJson<String>(json['id']),
fullName = nativeFromJson<String>(json['fullName']),
email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
photoUrl = json['photoUrl'] == null ? null : nativeFromJson<String>(json['photoUrl']);
photoUrl = json['photoUrl'] == null ? null : nativeFromJson<String>(json['photoUrl']),
averageRating = json['averageRating'] == null ? null : nativeFromJson<double>(json['averageRating']);
@override
bool operator ==(Object other) {
if(identical(this, other)) {
@@ -127,11 +129,12 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
fullName == otherTyped.fullName &&
email == otherTyped.email &&
phone == otherTyped.phone &&
photoUrl == otherTyped.photoUrl;
photoUrl == otherTyped.photoUrl &&
averageRating == otherTyped.averageRating;
}
@override
int get hashCode => Object.hashAll([id.hashCode, fullName.hashCode, email.hashCode, phone.hashCode, photoUrl.hashCode]);
int get hashCode => Object.hashAll([id.hashCode, fullName.hashCode, email.hashCode, phone.hashCode, photoUrl.hashCode, averageRating.hashCode]);
Map<String, dynamic> toJson() {
@@ -147,6 +150,9 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
if (photoUrl != null) {
json['photoUrl'] = nativeToJson<String?>(photoUrl);
}
if (averageRating != null) {
json['averageRating'] = nativeToJson<double?>(averageRating);
}
return json;
}
@@ -156,6 +162,7 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
this.email,
this.phone,
this.photoUrl,
this.averageRating,
});
}

2
apps/mobile/packages/features/client/view_orders/lib/src/data/repositories/view_orders_repository_impl.dart
View File

@@ -120,6 +120,8 @@ class ViewOrdersRepositoryImpl implements IViewOrdersRepository {
'worker_name': application.staff.fullName,
'status': 'confirmed',
'photo_url': application.staff.photoUrl,
'phone': application.staff.phone,
'rating': application.staff.averageRating,
});
}
return grouped;

97
apps/mobile/packages/features/client/view_orders/lib/src/presentation/widgets/view_order_card.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:intl/intl.dart';
import 'package:krow_data_connect/krow_data_connect.dart' as dc;
import 'package:krow_domain/krow_domain.dart';
import 'package:url_launcher/url_launcher.dart';
import '../blocs/view_orders_cubit.dart';
/// A rich card displaying details of a client order/shift.
@@ -234,14 +235,16 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
onTap: () => _openEditSheet(order: order),
),
const SizedBox(width: UiConstants.space2),
_buildHeaderIconButton(
icon: _expanded
? UiIcons.chevronUp
: UiIcons.chevronDown,
color: UiColors.iconSecondary,
bgColor: UiColors.bgSecondary,
onTap: () => setState(() => _expanded = !_expanded),
),
if (order.confirmedApps.isNotEmpty)
_buildHeaderIconButton(
icon: _expanded
? UiIcons.chevronUp
: UiIcons.chevronDown,
color: UiColors.iconSecondary,
bgColor: UiColors.bgSecondary,
onTap: () =>
setState(() => _expanded = !_expanded),
),
],
),
],
@@ -269,8 +272,7 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
_buildStatDivider(),
_buildStatItem(
icon: UiIcons.users,
value:
'${order.filled > 0 ? order.filled : order.workersNeeded}',
value: '${order.workersNeeded}',
label: 'Workers',
),
],
@@ -313,7 +315,7 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
),
const SizedBox(width: 8),
Text(
'${order.filled}/${order.workersNeeded} Workers Filled',
'${order.workersNeeded} Workers Filled',
style: UiTypography.body2m.textPrimary,
),
],
@@ -485,6 +487,7 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
/// Builds a detailed row for a worker.
Widget _buildWorkerRow(Map<String, dynamic> app) {
final String? phone = app['phone'] as String?;
return Container(
margin: const EdgeInsets.only(bottom: 12),
padding: const EdgeInsets.all(12),
@@ -515,9 +518,19 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
const SizedBox(height: 2),
Row(
children: <Widget>[
const Icon(UiIcons.star, size: 10, color: UiColors.accent),
const SizedBox(width: 2),
Text('4.8', style: UiTypography.footnote2r.textSecondary),
if ((app['rating'] as num?) != null &&
(app['rating'] as num) > 0) ...<Widget>[
const Icon(
UiIcons.star,
size: 10,
color: UiColors.accent,
),
const SizedBox(width: 2),
Text(
(app['rating'] as num).toStringAsFixed(1),
style: UiTypography.footnote2r.textSecondary,
),
],
if (app['check_in_time'] != null) ...<Widget>[
const SizedBox(width: 8),
Container(
@@ -536,20 +549,70 @@ class _ViewOrderCardState extends State<ViewOrderCard> {
),
),
),
] else if ((app['status'] as String?)?.isNotEmpty ?? false) ...<Widget>[
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 1,
),
decoration: BoxDecoration(
color: UiColors.bgSecondary,
borderRadius: BorderRadius.circular(4),
),
child: Text(
(app['status'] as String).toUpperCase(),
style: UiTypography.titleUppercase4m.copyWith(
color: UiColors.textSecondary,
),
),
),
],
],
),
],
),
),
_buildActionIconButton(icon: UiIcons.phone, onTap: () {}),
const SizedBox(width: 8),
_buildActionIconButton(icon: UiIcons.messageCircle, onTap: () {}),
if (phone != null && phone.isNotEmpty) ...<Widget>[
_buildActionIconButton(
icon: UiIcons.phone,
onTap: () => _confirmAndCall(phone),
),
],
],
),
);
}
Future<void> _confirmAndCall(String phone) async {
final bool? shouldCall = await showDialog<bool>(
context: context,
builder: (BuildContext context) {
return AlertDialog(
title: const Text('Call'),
content: Text('Do you want to call $phone?'),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: const Text('Cancel'),
),
TextButton(
onPressed: () => Navigator.of(context).pop(true),
child: const Text('Call'),
),
],
);
},
);
if (shouldCall != true) {
return;
}
final Uri uri = Uri(scheme: 'tel', path: phone);
await launchUrl(uri);
}
/// Specialized action button for worker rows.
Widget _buildActionIconButton({
required IconData icon,

2
backend/dataconnect/connector/application/queries.gql
View File

@@ -389,7 +389,7 @@ query listAcceptedApplicationsByBusinessForDay(
checkInTime
checkOutTime
appliedAt
staff { id fullName email phone photoUrl }
staff { id fullName email phone photoUrl averageRating }
}
}