some edits

pull/2/head
nextwo 3 years ago
parent 3737c3b41c
commit 44654e1e38

@ -115,13 +115,13 @@ class HospitalsProvider extends ChangeNotifier {
} }
} }
Future<List<Hospital>> getHospitalsListByVal({String searchVal=""}) async { Future<List<Hospital>> getHospitalsListByVal({String searchVal = ""}) async {
Response response; Response response;
try { try {
if(searchVal.isNotEmpty) { if (searchVal.isNotEmpty) {
searchVal = "?searchText=$searchVal"; searchVal = "?searchText=$searchVal";
} }
response = await ApiManager.instance.get(URLs.getHospitalsAutoComplete+searchVal); response = await ApiManager.instance.get(URLs.getHospitalsAutoComplete + searchVal);
// response = await get( // response = await get(
// Uri.parse(host + URLs.getHospitals // Uri.parse(host + URLs.getHospitals
// + ( title == null || title.isEmpty ? "" : "?name=$title" )), // + ( title == null || title.isEmpty ? "" : "?name=$title" )),

@ -57,7 +57,7 @@ class ServiceReportLastCallsProvider extends ChangeNotifier {
try { try {
// todo request new api from backend to make filter work // todo request new api from backend to make filter work
response = await ApiManager.instance.get( response = await ApiManager.instance.get(
"${URLs.getServiceReportLastCalls}?parentWOId=${woId??id}&isAdd=true&id=${id ?? 0}&typeTransaction=$typeName", "${URLs.getServiceReportLastCalls}?parentWOId=${woId ?? id}&isAdd=true&id=${id ?? 0}&typeTransaction=$typeName",
); );
// response = await get( // response = await get(
// Uri.parse( // Uri.parse(

@ -43,7 +43,7 @@ class Device {
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],
destRoom: parsedJson["destRoom"], destRoom: parsedJson["destRoom"],
destFloor: parsedJson["destFloor"], destFloor: parsedJson["destFloor"],
destSiteName:parsedJson['destSiteName'] destSiteName: parsedJson['destSiteName']
// parsedJson["modelDefinition"] == null ? "" : // parsedJson["modelDefinition"] == null ? "" :
// parsedJson["modelDefinition"]["manufacturerName"], // parsedJson["modelDefinition"]["manufacturerName"],
// model: parsedJson["modelDefinition"] == null ? "" : // model: parsedJson["modelDefinition"] == null ? "" :

@ -8,7 +8,7 @@ class Engineer {
}); });
factory Engineer.fromJson(Map<String, dynamic> parsedJson) { factory Engineer.fromJson(Map<String, dynamic> parsedJson) {
if(parsedJson==null) return Engineer(); if (parsedJson == null) return Engineer();
return Engineer( return Engineer(
id: parsedJson["userId"] ?? parsedJson["id"], id: parsedJson["userId"] ?? parsedJson["id"],
name: parsedJson["userName"] ?? parsedJson["name"], name: parsedJson["userName"] ?? parsedJson["name"],

@ -3,7 +3,8 @@ class FaultDescription {
this.id, this.id,
this.defectName, this.defectName,
this.workPerformed, this.workPerformed,
this.estimatedTime,}); this.estimatedTime,
});
FaultDescription.fromJson(dynamic json) { FaultDescription.fromJson(dynamic json) {
id = json['id']; id = json['id'];
@ -15,15 +16,18 @@ class FaultDescription {
String defectName; String defectName;
String workPerformed; String workPerformed;
String estimatedTime; String estimatedTime;
FaultDescription copyWith({ num id, FaultDescription copyWith({
num id,
String defectName, String defectName,
String workPerformed, String workPerformed,
String estimatedTime, String estimatedTime,
}) => FaultDescription( id: id ?? this.id, }) =>
FaultDescription(
id: id ?? this.id,
defectName: defectName ?? this.defectName, defectName: defectName ?? this.defectName,
workPerformed: workPerformed ?? this.workPerformed, workPerformed: workPerformed ?? this.workPerformed,
estimatedTime: estimatedTime ?? this.estimatedTime, estimatedTime: estimatedTime ?? this.estimatedTime,
); );
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final map = <String, dynamic>{}; final map = <String, dynamic>{};
map['id'] = id; map['id'] = id;
@ -32,5 +36,4 @@ FaultDescription copyWith({ num id,
map['estimatedTime'] = estimatedTime; map['estimatedTime'] = estimatedTime;
return map; return map;
} }
} }

@ -237,7 +237,6 @@ class Subtitle {
String room; String room;
String actions; String actions;
void setIssues(List<String> issues) { void setIssues(List<String> issues) {
issues.clear(); issues.clear();
issues.add(reason1); issues.add(reason1);

@ -245,7 +245,7 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
departments: _deviceTransferProvider?.floor?.departments, departments: _deviceTransferProvider?.floor?.departments,
onSelect: (status) { onSelect: (status) {
_deviceTransferProvider.department = status; _deviceTransferProvider.department = status;
_formModel.receiver.department = Department(id: status.id, name: status.name) ; _formModel.receiver.department = Department(id: status.id, name: status.name);
setState(() {}); setState(() {});
}, },
), ),
@ -261,7 +261,7 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
validator: (value) => Validator.isNumeric(value) ? null : "allow numbers only", validator: (value) => Validator.isNumeric(value) ? null : "allow numbers only",
textInputType: TextInputType.number, textInputType: TextInputType.number,
onSaved: (value) { onSaved: (value) {
_deviceTransferProvider.room=value; _deviceTransferProvider.room = value;
}, },
), ),
12.height, 12.height,

@ -115,14 +115,13 @@ class _LoginState extends State<Login> {
host: _settingProvider.host, host: _settingProvider.host,
); );
if (status >= 200 && status < 300) { if (status >= 200 && status < 300) {
if(_userProvider.user.isAuthenticated ?? false) { if (_userProvider.user.isAuthenticated ?? false) {
_settingProvider.setUser(_userProvider.user); _settingProvider.setUser(_userProvider.user);
Navigator.of(context).pushNamed(LandPage.id); Navigator.of(context).pushNamed(LandPage.id);
} else { } else {
Fluttertoast.showToast(msg: _userProvider.user.message); Fluttertoast.showToast(msg: _userProvider.user.message);
} }
// if (_userProvider.user.isActive) // if (_userProvider.user.isActive)
// else // else

@ -135,12 +135,10 @@ class _SearchSubWorkOrderPageState extends State<SearchSubWorkOrderPage> {
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
HospitalAutoCompleteField( HospitalAutoCompleteField(
initialValue:_site, initialValue: _site,
onSearch: (value) { onSearch: (value) {
_site = value.name; _site = value.name;
setState(() { setState(() {});
});
}, },
), ),
const SizedBox(height: 16), const SizedBox(height: 16),

@ -55,7 +55,9 @@ class _WorkOrderUpdateState extends State<WorkOrderUpdate> {
], ],
), ),
), ),
WorkOrderDetails(item: widget.item,) WorkOrderDetails(
item: widget.item,
)
], ],
), ),
), ),

@ -31,8 +31,7 @@ class _FutureServiceReportState extends State<FutureServiceReport> {
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
_settingProvider = Provider.of<SettingProvider>(context); _settingProvider = Provider.of<SettingProvider>(context);
Subtitle _subtitle = AppLocalization.of(context).subtitle; Subtitle _subtitle = AppLocalization.of(context).subtitle;
ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle) ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle);
;
return Scaffold( return Scaffold(
body: FutureBuilder<ServiceReport>( body: FutureBuilder<ServiceReport>(
future: ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle), future: ServiceRequestsProvider().getSingleServiceReport(reportId: widget.workOrder.id, user: _userProvider.user, host: _settingProvider.host, subtitle: _subtitle),

@ -345,7 +345,7 @@ class RequestDetailsPage extends StatelessWidget {
title: _subtitle.visitDate, title: _subtitle.visitDate,
info: workOrders[index].visitDate, info: workOrders[index].visitDate,
), ),
RequestInfoRow(title: _subtitle.assignedEmployee, info: workOrders[index].assignedEmployee?.name??""), RequestInfoRow(title: _subtitle.assignedEmployee, info: workOrders[index].assignedEmployee?.name ?? ""),
RequestInfoRow( RequestInfoRow(
title: _subtitle.assetSN, title: _subtitle.assetSN,
info: workOrders[index].callRequest.asset.assetSerialNo, info: workOrders[index].callRequest.asset.assetSerialNo,

@ -20,7 +20,7 @@ class ADateTimePicker extends StatelessWidget {
), ),
), ),
child: Text( child: Text(
date == null ? "Pick Time" : date.toString().substring(0,date.toString().lastIndexOf(":")), date == null ? "Pick Time" : date.toString().substring(0, date.toString().lastIndexOf(":")),
textScaleFactor: AppStyle.getScaleFactor(context), textScaleFactor: AppStyle.getScaleFactor(context),
), ),
onPressed: () async { onPressed: () async {

@ -106,7 +106,8 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
), ),
const SizedBox( const SizedBox(
height: 8, height: 8,
),ATextFormField( ),
ATextFormField(
hintText: _subtitle.searchBySn, hintText: _subtitle.searchBySn,
controller: snController, controller: snController,
style: Theme.of(context).textTheme.subtitle1, style: Theme.of(context).textTheme.subtitle1,
@ -120,7 +121,6 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
_searchableList.addAll(_devicesProvider.devices); _searchableList.addAll(_devicesProvider.devices);
}, },
), ),
], ],
), ),
), ),

@ -44,10 +44,8 @@ class _SingleStatusMenuState extends State<FaultDescriptionMenu> {
@override @override
void initState() { void initState() {
if (widget.initialStatus != null) { if (widget.initialStatus != null) {
final result = widget.statuses?.where((element) { final result = widget.statuses?.where((element) {
return element.id == widget.initialStatus.id; return element.id == widget.initialStatus.id;
}); });
if (result.isNotEmpty) _selectedStatus = result.first; if (result.isNotEmpty) _selectedStatus = result.first;

Loading…
Cancel
Save