Simple Changes

design_3.0_internal_audit_module
zaid_daoud 3 years ago
parent be6a418bb6
commit 5890835f7b

@ -53,9 +53,10 @@ class DeviceTransfer {
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],
destFloor: parsedJson["destFloor"], destFloor: parsedJson["destFloorName"],
destRoom: parsedJson["destRoom"], destRoom: parsedJson["destRoom"],
destSiteName: parsedJson["destSiteName"]), destSiteName: parsedJson["destSiteName"],
),
sender: DeviceTransferInfo( sender: DeviceTransferInfo(
travelingHours: parsedJson["senderTravelingHours"], travelingHours: parsedJson["senderTravelingHours"],
comment: parsedJson["senderComment"], comment: parsedJson["senderComment"],

@ -16,6 +16,8 @@ import 'package:test_sa/views/widgets/device_trancfer/device_transfer_info_secti
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/requests/info_row.dart'; import 'package:test_sa/views/widgets/requests/info_row.dart';
import '../../../models/enums/user_types.dart';
class DeviceTransferDetails extends StatefulWidget { class DeviceTransferDetails extends StatefulWidget {
final DeviceTransfer model; final DeviceTransfer model;
@ -132,6 +134,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Sender", style: Theme.of(context).textTheme.headline6), child: Text("Sender", style: Theme.of(context).textTheme.headline6),
), ),
if (_userProvider.user?.type == UsersTypes.engineer)
ASmallButton( ASmallButton(
text: _subtitle.edit, text: _subtitle.edit,
onPressed: (_isSender || false) onPressed: (_isSender || false)
@ -156,6 +159,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Expanded( Expanded(
child: Text("Receiver", style: Theme.of(context).textTheme.headline6), child: Text("Receiver", style: Theme.of(context).textTheme.headline6),
), ),
if (_userProvider.user?.type == UsersTypes.engineer)
ASmallButton( ASmallButton(
text: _subtitle.edit, text: _subtitle.edit,
onPressed: (_isReceiver || false) onPressed: (_isReceiver || false)

@ -73,7 +73,9 @@ class VisitDetailsPage extends StatelessWidget {
), ),
MaterialButton( MaterialButton(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
onPressed: () { onPressed: visit.images.isEmpty || (visit.images?.first?.isEmpty ?? false)
? () {}
: () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(
builder: (_) => Scaffold( builder: (_) => Scaffold(
body: InteractiveViewer( body: InteractiveViewer(

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/models/device/device_transfer_info.dart'; import 'package:test_sa/models/device/device_transfer_info.dart';
import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/colors.dart';
@ -6,6 +7,8 @@ import 'package:test_sa/views/widgets/loaders/image_loader.dart';
import 'package:test_sa/views/widgets/requests/info_row.dart'; import 'package:test_sa/views/widgets/requests/info_row.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart';
import '../../../controllers/providers/api/user_provider.dart';
class DeviceTransferInfoSection extends StatelessWidget { class DeviceTransferInfoSection extends StatelessWidget {
final DeviceTransferInfo info; final DeviceTransferInfo info;
final VoidCallback onEdit; final VoidCallback onEdit;
@ -13,6 +16,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserProvider userProvider = Provider.of<UserProvider>(context);
final subtitle = AppLocalization.of(context).subtitle; final subtitle = AppLocalization.of(context).subtitle;
return Column( return Column(
children: [ children: [
@ -26,7 +30,7 @@ class DeviceTransferInfoSection extends StatelessWidget {
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle.engineerName, title: subtitle.engineerName,
info: info.userName, info: userProvider.user.username,
), ),
RequestInfoRow( RequestInfoRow(
title: subtitle.workingHours, title: subtitle.workingHours,

Loading…
Cancel
Save