diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index ff04c64b..a3c52227 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -3,14 +3,14 @@ class URLs { static const String appReleaseBuildNumber = "17"; - static const host1 = "https://atomsm.hmg.com"; // production url + // static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url - // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url + static const host1 = "https://atomsmuat.hmg.com"; // local UAT url - // static String _baseUrl = "$_host/mobile"; + static String _baseUrl = "$_host/mobile"; // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis // static final String _baseUrl = "$_host/mobile"; // host local UAT - static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM + // static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM static String _host = host1; diff --git a/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart b/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart index 89bcbcf9..7c412338 100644 --- a/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart +++ b/lib/new_views/pages/land_page/create_request-type_bottomsheet.dart @@ -90,12 +90,12 @@ class CreateRequestModel { if (Provider.of(context, listen: false).engineerCanCreateCM) { list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id)); } - // list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); // todo enable it in NextRelease + list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); } else { list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id)); list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName)); list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id)); - // list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); // todo enable it in NextRelease + list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); } return list; } diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index d5fcbaa0..fb0d7512 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -63,7 +63,7 @@ class _AllRequestsFilterPageState extends State { context.translation.gasRefill: 2, context.translation.transferAsset: 3, context.translation.preventiveMaintenance: 4, - // context.translation.task: 6,// todo enable it in NextRelease + context.translation.task: 6, }; if (isEngineer) { types.addAll({context.translation.recurrentWo: 5}); diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 19546da5..6ff9944a 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -43,7 +43,7 @@ class _MyRequestsPageState extends State { if (Provider.of(context, listen: false).user!.type != UsersTypes.normal_user) { requestsList.add(context.translation.recurrentWo); } - // context.translation.taskRequest // todo enable it in NextRelease + requestsList.add(context.translation.taskRequest); _provider = Provider.of(context, listen: false); _provider!.reset();