urgent improvements.

main_design2.0
Sikander Saleem 2 years ago
parent 050c710bf8
commit c9f903fac8

@ -49,8 +49,8 @@ android {
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
versionCode 4 versionCode 5
versionName '1.0.4' versionName '1.0.5'
} }
signingConfigs { signingConfigs {

@ -6,7 +6,7 @@ class URLs {
//static const host1 = "https://atomsuat.hmg.com"; // old uat url //static const host1 = "https://atomsuat.hmg.com"; // old uat url
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 UAT url // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url
// static const host1 = "http://109.123.243.118:9000"; // static const host1 = "http://109.123.243.118:9000";
@ -21,7 +21,8 @@ class URLs {
// static String getFileUrl(String file) => (file == null || file.isEmpty) ? null :1 (file.contains("/") ? file : "$_host/attachment/$file"); // static String getFileUrl(String file) => (file == null || file.isEmpty) ? null :1 (file.contains("/") ? file : "$_host/attachment/$file");
// API Routes // API Routes
static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // post // static get login => "$_baseUrl/MobileAuth/Login"; // web login
static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // mobile login
static get register => "$_baseUrl/handle/create/user"; // post static get register => "$_baseUrl/handle/create/user"; // post
static get updateProfile => "$_baseUrl/update/user/profile"; // post static get updateProfile => "$_baseUrl/update/user/profile"; // post
static get getHospitals => "$_baseUrl/Customer/GetCustomers"; // get static get getHospitals => "$_baseUrl/Customer/GetCustomers"; // get

@ -19,18 +19,24 @@ class ServiceReportAssistantsEmployeeProvider extends ChangeNotifier {
// like 400 customer request failed // like 400 customer request failed
// 500 service not available // 500 service not available
int _stateCode; int _stateCode;
int get stateCode => _stateCode; int get stateCode => _stateCode;
set setStateCode(int statusCode) => _stateCode = statusCode;
// contain user data // contain user data
// when user not login or register _user = null // when user not login or register _user = null
List<AssistantEmployees> _assistantEmployees; List<AssistantEmployees> _assistantEmployees;
List<AssistantEmployees> get assistantEmployees => _assistantEmployees; List<AssistantEmployees> get assistantEmployees => _assistantEmployees;
// when categories in-process _loading = true // when categories in-process _loading = true
// done _loading = true // done _loading = true
// failed _loading = false // failed _loading = false
bool _loading; bool _loading;
bool get isLoading => _loading; bool get isLoading => _loading;
set isLoading(bool isLoading) { set isLoading(bool isLoading) {
_loading = isLoading; _loading = isLoading;
notifyListeners(); notifyListeners();
@ -41,14 +47,14 @@ class ServiceReportAssistantsEmployeeProvider extends ChangeNotifier {
/// return state code if request complete may be 200, 404 or 403 /// return state code if request complete may be 200, 404 or 403
/// for more details check http state manager /// for more details check http state manager
/// lib\controllers\http_status_manger\http_status_manger.dart /// lib\controllers\http_status_manger\http_status_manger.dart
Future<int> getAssistantEmployees() async { Future<int> getAssistantEmployees(num assetId) async {
if (_loading == true) return -2; if (_loading == true) return -2;
_loading = true; _loading = true;
notifyListeners(); notifyListeners();
Response response; Response response;
try { try {
response = await ApiManager.instance.get( response = await ApiManager.instance.get(
"${URLs.getEngineers}", "${URLs.getEngineers}&assetId=$assetId",
); );
// response = await get( // response = await get(
// Uri.parse( // Uri.parse(

@ -258,7 +258,10 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
useSafeArea: true, useSafeArea: true,
isScrollControlled: true, isScrollControlled: true,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
builder: (context) => WorkOrderDetailsBottomSheet(subWorkOrder: _subWorkOrders), builder: (context) => WorkOrderDetailsBottomSheet(
subWorkOrder: _subWorkOrders,
assetId: widget.workOrder?.callRequest?.asset?.id,
),
); );
//log(_subWorkOrders?.toJson()?.toString()); //log(_subWorkOrders?.toJson()?.toString());
}, },

@ -19,7 +19,9 @@ import 'auto_generated_vendor_name.dart';
class WorkOrderDetailsBottomSheet extends StatefulWidget { class WorkOrderDetailsBottomSheet extends StatefulWidget {
final SearchWorkOrder subWorkOrder; final SearchWorkOrder subWorkOrder;
const WorkOrderDetailsBottomSheet({this.subWorkOrder, Key key}) : super(key: key); final num assetId;
const WorkOrderDetailsBottomSheet({this.subWorkOrder, this.assetId, Key key}) : super(key: key);
@override @override
State<WorkOrderDetailsBottomSheet> createState() => _WorkOrderDetailsBottomSheetState(); State<WorkOrderDetailsBottomSheet> createState() => _WorkOrderDetailsBottomSheetState();
@ -91,6 +93,7 @@ class _WorkOrderDetailsBottomSheetState extends State<WorkOrderDetailsBottomShee
const ASubTitle("Assistant Employee"), const ASubTitle("Assistant Employee"),
const SizedBox(height: 4), const SizedBox(height: 4),
ServiceReportAssistantEmployeeMenu( ServiceReportAssistantEmployeeMenu(
assetId: widget.assetId,
initialValue: (_workOrder.assistantEmployees?.isNotEmpty ?? false) ? _workOrder.assistantEmployees?.first : null, initialValue: (_workOrder.assistantEmployees?.isNotEmpty ?? false) ? _workOrder.assistantEmployees?.first : null,
onSelect: (assistantsEmployee) { onSelect: (assistantsEmployee) {
_workOrder.assistantEmployees = [assistantsEmployee]; _workOrder.assistantEmployees = [assistantsEmployee];

@ -68,7 +68,7 @@ class _PentryPPMCheckListFormState extends State<PentryPPMCheckListForm> {
height: 4, height: 4,
), ),
ATextFormField( ATextFormField(
initialValue: (model.title ?? "").toString(), initialValue: (model.title?.trim() ?? "").toString(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle1, style: Theme.of(context).textTheme.subtitle1,
textInputType: TextInputType.text, textInputType: TextInputType.text,

@ -9,7 +9,10 @@ import '../../../../controllers/providers/api/status_drop_down/report/service_re
class ServiceReportAssistantEmployeeMenu extends StatelessWidget { class ServiceReportAssistantEmployeeMenu extends StatelessWidget {
final Function(AssistantEmployees) onSelect; final Function(AssistantEmployees) onSelect;
final AssistantEmployees initialValue; final AssistantEmployees initialValue;
const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue}) : super(key: key); final num assetId;
const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue, this.assetId}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ServiceReportAssistantsEmployeeProvider menuProvider = Provider.of<ServiceReportAssistantsEmployeeProvider>(context); ServiceReportAssistantsEmployeeProvider menuProvider = Provider.of<ServiceReportAssistantsEmployeeProvider>(context);
@ -18,7 +21,8 @@ class ServiceReportAssistantEmployeeMenu extends StatelessWidget {
isFailedLoading: menuProvider.assistantEmployees == null, isFailedLoading: menuProvider.assistantEmployees == null,
stateCode: menuProvider.stateCode, stateCode: menuProvider.stateCode,
onRefresh: () async { onRefresh: () async {
await menuProvider.getAssistantEmployees(); await menuProvider.getAssistantEmployees(assetId);
// menuProvider.setStateCode = null;
}, },
child: AssistantEmployeeMenu( child: AssistantEmployeeMenu(
initialStatus: initialValue, initialStatus: initialValue,

@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.5+4 version: 1.0.6+5
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save