improvements.

main_design2.0
Sikander Saleem 2 years ago
parent a7f5fcb911
commit eeaa9bef85

@ -40,6 +40,13 @@ post_install do |installer|
target.build_configurations.each do |config| target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
end end
target.build_configurations.each do |config|
flutter_additional_ios_build_settings(target)
xcconfig_path = config.base_configuration_reference.real_path
xcconfig = File.read(xcconfig_path)
xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
end
end end
installer.generated_projects.each do |project| installer.generated_projects.each do |project|
project.targets.each do |target| project.targets.each do |target|

@ -161,7 +161,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
BuildIndependentTargetsInParallel = YES; BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1500; LastUpgradeCheck = 1300;
ORGANIZATIONNAME = ""; ORGANIZATIONNAME = "";
TargetAttributes = { TargetAttributes = {
97C146ED1CF9000F007C117D = { 97C146ED1CF9000F007C117D = {
@ -371,8 +371,9 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = DQ779YN74J; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Atoms; INFOPLIST_KEY_CFBundleDisplayName = Atoms;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
@ -593,8 +594,9 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = DQ779YN74J; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Atoms; INFOPLIST_KEY_CFBundleDisplayName = Atoms;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
@ -701,8 +703,9 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = DQ779YN74J; DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Atoms; INFOPLIST_KEY_CFBundleDisplayName = Atoms;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1500" LastUpgradeVersion = "1300"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

@ -140,7 +140,7 @@ class AllRequestsProvider extends ChangeNotifier {
Future<int> getHighPriorityRequests() async { Future<int> getHighPriorityRequests() async {
if (isHighPriorityLoading == true) return -2; if (isHighPriorityLoading == true) return -2;
isHighPriorityLoading = true; isHighPriorityLoading = true; notifyListeners();
if (highPriorityRequests == null) notifyListeners(); if (highPriorityRequests == null) notifyListeners();
Response response; Response response;
try { try {

@ -163,6 +163,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false); final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
if (search.startDate != null) search.endDate ??= DateTime.now(); if (search.startDate != null) search.endDate ??= DateTime.now();
showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
requestsProvider.reset();
await requestsProvider.getAllRequests(context, search: search); await requestsProvider.getAllRequests(context, search: search);
Navigator.pop(context); Navigator.pop(context);
Navigator.of(context).pop(search); Navigator.of(context).pop(search);

@ -133,6 +133,7 @@ class _AllRequestsSearchPageState extends State<AllRequestsSearchPage> {
_formKey.currentState.save(); _formKey.currentState.save();
final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false); final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
requestsProvider.reset();
await requestsProvider.getAllRequests(context, search: search); await requestsProvider.getAllRequests(context, search: search);
Navigator.pop(context); Navigator.pop(context);
Navigator.of(context).pop(search); Navigator.of(context).pop(search);

@ -37,6 +37,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
context.translation.preventiveMaintenance, context.translation.preventiveMaintenance,
]; ];
_provider = Provider.of<AllRequestsProvider>(context, listen: false); _provider = Provider.of<AllRequestsProvider>(context, listen: false);
_provider.reset();
_provider.getAllRequests(context); _provider.getAllRequests(context);
} }

@ -134,12 +134,15 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final user = Provider.of<UserProvider>(context).user; final user = Provider.of<UserProvider>(context).user;
final isCurrentAssigned = (user.userID != widget.workOrder.assignedEmployee?.id); final isCurrentUserIsAssistantEmp = (user.userID != widget.workOrder.assignedEmployee?.id);
if (isCurrentAssigned) { if (isCurrentUserIsAssistantEmp) {
// _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)]; // _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)];
_subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))]; _subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))];
} }
print("isCurrentAssigned:$isCurrentAssigned:${_subWorkOrders.assistantEmployees?.length}"); else {
}
print("isCurrentUserIsAssistantEmp:$isCurrentUserIsAssistantEmp:${widget.workOrder.assistantEmployees?.length}");
if (_callRequestForWorkOrder == null) { if (_callRequestForWorkOrder == null) {
_partsProvider = Provider.of<PartsProvider>(context); _partsProvider = Provider.of<PartsProvider>(context);
getAssetType(); getAssetType();
@ -321,7 +324,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
// : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) // : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false)
// ? _subWorkOrders.assistantEmployees?.first // ? _subWorkOrders.assistantEmployees?.first
// : null, // : null,
enable: user.userID == _subWorkOrders.assignedEmployee.id, enable: !isCurrentUserIsAssistantEmp,
onSelect: (employee) { onSelect: (employee) {
if (employee == null) { if (employee == null) {
_subWorkOrders.assistantEmployees = []; _subWorkOrders.assistantEmployees = [];

Loading…
Cancel
Save