Merge branch 'hot_fix' into 'development'

hot fix

See merge request Cloud_Solution/doctor_app_flutter!973

lib/screens/procedures/base_add_procedure_tab_page.dart

@@ -78,72 +78,70 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
             appBar: BottomSheetTitle(title: procedureType.getToolbarLabel(context),),
             body: NetworkBaseView(
             baseViewModel: model,
-            child: Expanded(
-              child: Scaffold(
-                extendBodyBehindAppBar: true,
-                appBar: PreferredSize(
-                  preferredSize: Size.fromHeight(
-                      MediaQuery.of(context).size.height * 0.070),
-                  child: TabBar(
-                    isScrollable: false,
-                    controller: _tabController,
-                    indicatorColor: Colors.transparent,
-                    indicatorWeight: 1.0,
-                    indicatorSize: TabBarIndicatorSize.tab,
-                    labelColor: Theme.of(context).primaryColor,
-                    labelPadding: EdgeInsets.only(
-                        top: 0, left: 0, right: 0, bottom: 0),
-                    unselectedLabelColor: Colors.grey[800],
-                    tabs: [
-                      tabWidget(
-                          screenSize,
-                          _activeTab == 0,
+            child: Scaffold(
+              extendBodyBehindAppBar: true,
+              appBar: PreferredSize(
+                preferredSize: Size.fromHeight(
+                    MediaQuery.of(context).size.height * 0.070),
+                child: TabBar(
+                  isScrollable: false,
+                  controller: _tabController,
+                  indicatorColor: Colors.transparent,
+                  indicatorWeight: 1.0,
+                  indicatorSize: TabBarIndicatorSize.tab,
+                  labelColor: Theme.of(context).primaryColor,
+                  labelPadding: EdgeInsets.only(
+                      top: 0, left: 0, right: 0, bottom: 0),
+                  unselectedLabelColor: Colors.grey[800],
+                  tabs: [
+                    tabWidget(
+                        screenSize,
+                        _activeTab == 0,
 
-                          procedureType
-                              .getFavouriteTabName(context),
-                          isFirst: true,context: context
-                      ),
-                      tabWidget(
-                          screenSize,
-                          _activeTab == 1,
-                          procedureType.getAllLabelName(context),
-                          isLast: true,context: context
-                      ),
-                    ],
-                  ),
+                        procedureType
+                            .getFavouriteTabName(context),
+                        isFirst: true,context: context
+                    ),
+                    tabWidget(
+                        screenSize,
+                        _activeTab == 1,
+                        procedureType.getAllLabelName(context),
+                        isLast: true,context: context
+                    ),
+                  ],
                 ),
-                body: Column(
-                  children: [
-                    Expanded(
-                      child: TabBarView(
-                        physics: BouncingScrollPhysics(),
-                        controller: _tabController,
-                        children: [
-                          AddFavouriteProcedure(
-                            previousProcedureViewModel: model,
-                            prescriptionModel:
+              ),
+              body: Column(
+                children: [
+                  Expanded(
+                    child: TabBarView(
+                      physics: BouncingScrollPhysics(),
+                      controller: _tabController,
+                      children: [
+                        AddFavouriteProcedure(
+                          previousProcedureViewModel: model,
+                          prescriptionModel:
+                          widget.prescriptionModel,
+                          patient: patient,
+                          procedureType: procedureType,
+                        ),
+                        if (widget.procedureType ==
+                            ProcedureType.PRESCRIPTION)
+                          AddPrescription(
                             widget.prescriptionModel,
+                            widget.patient,
+                            widget.prescriptionModel.prescriptionList,
+                          )
+                        else
+                          AddProcedurePage(
+                            model: this.model,
                             patient: patient,
                             procedureType: procedureType,
                           ),
-                          if (widget.procedureType ==
-                              ProcedureType.PRESCRIPTION)
-                            AddPrescription(
-                              widget.prescriptionModel,
-                              widget.patient,
-                              widget.prescriptionModel.prescriptionList,
-                            )
-                          else
-                            AddProcedurePage(
-                              model: this.model,
-                              patient: patient,
-                              procedureType: procedureType,
-                            ),
-                        ],
-                      ),
+                      ],
                     ),
-                  ],
-                ),
+                  ),
+                ],
               ),
             )
         ),