PAP-562: fix status

4 years ago · aa1c92c142
parent 8c5b3742b6
commit aa1c92c142
1 changed files with 72 additions and 71 deletions
--- a/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
+++ b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
@ -47,80 +47,81 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
  Widget build(BuildContext context) {
    return AppScaffold(
      body: widget.amRequestViewModel.pickUpRequestPresOrder != null
-          ? Column(
-              children: [
-                SizedBox(
-                  height: 80,
-                ),
-                Container(
-                  margin: EdgeInsets.only(left: 18, right: 18),
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    borderRadius: BorderRadius.circular(2),
+          ? SingleChildScrollView(
+            child: Column(
+                children: [
+                  SizedBox(
+                    height: 80,
                  ),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      OrderLogItem(
-                        title: TranslationBase.of(context).reqId,
-                        value: widget.amRequestViewModel.pickUpRequestPresOrder
-                            .presOrderID
-                            .toString(),
-                      ),
-                      OrderLogItem(
-                        title: TranslationBase.of(context).status,
-                        value: widget.amRequestViewModel.pickUpRequestPresOrder
-                            .ambulateDescription,
-                      ),
-                      OrderLogItem(
-                        title: TranslationBase.of(context).pickupDate,
-                        value: DateUtil.getDayMonthYearDateFormatted(
-                            DateUtil.convertStringToDate(widget
-                                .amRequestViewModel
-                                .pickUpRequestPresOrder
-                                .lastEditDate)),
-                      ),
-                      OrderLogItem(
-                        title: TranslationBase.of(context).pickupLocation,
-                        value: widget.amRequestViewModel.pickUpRequestPresOrder
-                            .pickupLocationName,
-                      ),
-                      OrderLogItem(
-                        title: TranslationBase.of(context).dropoffLocation,
-                        value: widget.amRequestViewModel.pickUpRequestPresOrder
-                            .dropoffLocationName,
-                      ),
-                      OrderLogItem(
-                        title: TranslationBase.of(context).transportMethod,
-                        value: widget
-                            .amRequestViewModel.pickUpRequestPresOrder.title,
-                      ),
-                      Container(
-                        padding: EdgeInsets.all(10),
-                        width: double.maxFinite,
-                        margin: EdgeInsets.only(bottom: 4, left: 4, right: 4),
-                        decoration: BoxDecoration(
-                            borderRadius: BorderRadius.only(
-                              bottomRight: Radius.circular(12),
-                              bottomLeft: Radius.circular(12),
-                            ),
-                            color: Colors.white),
-                        child: SecondaryButton(
-                          color: Colors.red[900],
-                          textColor: Colors.white,
-                          label: TranslationBase.of(context).cancel,
-                          onTap: () {
-                            widget.amRequestViewModel.updatePressOrder(
-                                presOrderID: widget.amRequestViewModel
-                                    .pickUpRequestPresOrder.presOrderID);
-                          },
+                  Container(
+                    margin: EdgeInsets.only(left: 18, right: 18),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(2),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        OrderLogItem(
+                          title: TranslationBase.of(context).reqId,
+                          value: widget.amRequestViewModel.pickUpRequestPresOrder
+                              .presOrderID
+                              .toString(),
                        ),
-                      )
-                    ],
+                        OrderLogItem(
+                          title: TranslationBase.of(context).status,
+                          value: widget.amRequestViewModel.pickUpRequestPresOrder.status ==0?TranslationBase.of(context).pending:'',
+                        ),
+                        OrderLogItem(
+                          title: TranslationBase.of(context).pickupDate,
+                          value: DateUtil.getDayMonthYearDateFormatted(
+                              DateUtil.convertStringToDate(widget
+                                  .amRequestViewModel
+                                  .pickUpRequestPresOrder
+                                  .lastEditDate)),
+                        ),
+                        OrderLogItem(
+                          title: TranslationBase.of(context).pickupLocation,
+                          value: widget.amRequestViewModel.pickUpRequestPresOrder
+                              .pickupLocationName,
+                        ),
+                        OrderLogItem(
+                          title: TranslationBase.of(context).dropoffLocation,
+                          value: widget.amRequestViewModel.pickUpRequestPresOrder
+                              .dropoffLocationName,
+                        ),
+                        OrderLogItem(
+                          title: TranslationBase.of(context).transportMethod,
+                          value: widget
+                              .amRequestViewModel.pickUpRequestPresOrder.title,
+                        ),
+                        Container(
+                          padding: EdgeInsets.all(10),
+                          width: double.maxFinite,
+                          margin: EdgeInsets.only(bottom: 4, left: 4, right: 4),
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.only(
+                                bottomRight: Radius.circular(12),
+                                bottomLeft: Radius.circular(12),
+                              ),
+                              color: Colors.white),
+                          child: SecondaryButton(
+                            color: Colors.red[900],
+                            textColor: Colors.white,
+                            label: TranslationBase.of(context).cancel,
+                            onTap: () {
+                              widget.amRequestViewModel.updatePressOrder(
+                                  presOrderID: widget.amRequestViewModel
+                                      .pickUpRequestPresOrder.presOrderID);
+                            },
+                          ),
+                        )
+                      ],
+                    ),
                  ),
-                ),
-              ],
-            )
+                ],
+              ),
+          )
          : Column(
              children: [
                SizedBox(