Merge branch 'refs/heads/main_production_ai_enhancement' into cleaner_module_new_flow

cleaner_module_new_flow
Sikander Saleem 2 weeks ago
commit 14371d42f2

@ -3,9 +3,9 @@ import 'package:test_sa/models/new_models/room_model.dart';
import '../base.dart';
class TrafDepartment extends Base {
TrafDepartment({
this.departmentName, this.departmentCode, this.ntCode, this.costCenterNumber, this.costCenterName, this.name, this.id, this.createdBy, this.createdDate, this.modifiedBy, this.modifiedDate
}) : super(identifier: id?.toString() ?? '', name: departmentName); // Handle potential null id
TrafDepartment(
{this.departmentName, this.departmentCode, this.ntCode, this.costCenterNumber, this.costCenterName, this.name, this.id, this.createdBy, this.createdDate, this.modifiedBy, this.modifiedDate})
: super(identifier: id?.toString() ?? '', name: departmentName); // Handle potential null id
TrafDepartment.fromJson(Map<String, dynamic> json) {
departmentName = json['departmentName'] ?? json['name'];
@ -15,6 +15,7 @@ class TrafDepartment extends Base {
costCenterName = json['costCenterName'];
name = json['name'];
id = json['id'];
identifier = id?.toString() ?? '';
createdBy = json['createdBy'];
createdDate = json['createdDate'];
modifiedBy = json['modifiedBy'];
@ -33,24 +34,22 @@ class TrafDepartment extends Base {
String? modifiedBy;
String? modifiedDate;
// TrafDepartment copyWith({
// num? id, // Parameters are now nullable
// String? departmentName,
// String? departmentCode,
// String? departmentId,
// String? ntCode,
// List<Rooms>? rooms,
// }) =>
// TrafDepartment(
// id: id ?? this.id,
// departmentName: departmentName ?? this.departmentName,
// departmentCode: departmentCode ?? this.departmentCode,
// departmentId: departmentId ?? this.departmentId,
// ntCode: ntCode ?? this.ntCode,
// rooms: rooms ?? this.rooms,
// );
// TrafDepartment copyWith({
// num? id, // Parameters are now nullable
// String? departmentName,
// String? departmentCode,
// String? departmentId,
// String? ntCode,
// List<Rooms>? rooms,
// }) =>
// TrafDepartment(
// id: id ?? this.id,
// departmentName: departmentName ?? this.departmentName,
// departmentCode: departmentCode ?? this.departmentCode,
// departmentId: departmentId ?? this.departmentId,
// ntCode: ntCode ?? this.ntCode,
// rooms: rooms ?? this.rooms,
// );
}
// class TrafDepartment extends Base {

@ -135,10 +135,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
// spacing: 8,
runSpacing: 8,
children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
if (Provider.of<SettingProvider>(context, listen: false).showPriority&&workOrder.priority!=null) ...[
StatusLabel(
label: workOrder.priority?.name,
id: workOrder.priority!.value!,
id: workOrder.priority?.value,
radius: 4,
textColor: AppColor.getPriorityStatusTextColor(context, workOrder.priority!.value!),
backgroundColor: AppColor.getPriorityStatusColor(context, workOrder.priority!.value!),

@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/validator/validator.dart';
import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/enum_extensions.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
@ -315,6 +316,7 @@ class _CreateLoanRequestPageState extends State<CreateLoanRequestPage> with Tick
SingleItemDropDownMenu<TrafDepartment, DepartmentLookupProvider>(
context: context,
title: context.translation.department,
matchBy: DropDownMatchType.identifier,
showShadow: false,
enabled: !isBackUpRequest,
validator: (value) {

@ -32,7 +32,7 @@ class ServiceRequestItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
if (Provider.of<SettingProvider>(context, listen: false).showPriority && requestData?.priorityName != null && requestData!.priorityName!.isNotEmpty) ...[
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
@ -95,7 +95,7 @@ class ServiceRequestItemView extends StatelessWidget {
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
if (Provider.of<SettingProvider>(context, listen: false).showPriority && requestDetails!.priority != null && requestDetails!.priority!.isNotEmpty) ...[
StatusLabel(
label: requestDetails!.priority,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority),

Loading…
Cancel
Save