Merge pull request #13 from SyncrowIOT/aug_bug_fixes2

handling "Lux" description in case of illuminance_value report

.github/workflows/azure-static-web-apps-agreeable-wave-096d61a10.yml

@@ -0,0 +1,60 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Build Flutter Web App
+        run: flutter build web
+
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_MUSHROOM_0D31A3303 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/build/web" # App source code path
+          api_location: "" # Api source code path - optional
+          output_location: "/build/web" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ZEALOUS_MUSHROOM_0D31A3303 }}
+          action: "close"

lib/pages/device_managment/shared/table/report_table.dart

@@ -58,7 +58,7 @@ class ReportsTable extends StatelessWidget {
                       TableCellWidget(value: date),
                       TableCellWidget(value: time),
                       TableCellWidget(
-                        value: '${data.value!} $thirdColumnDescription',
+                        value: '${data.value!} ${thirdColumnDescription ?? ''}',
                         onTap: () => onRowTap(index),
                       ),
                     ],

lib/pages/device_managment/wall_sensor/bloc/bloc.dart

@@ -99,7 +99,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     try {
       await DevicesManagementApi.getDeviceReports(deviceId, event.code)
           .then((value) {
-        emit(DeviceReportsState(deviceReport: value));
+        emit(DeviceReportsState(deviceReport: value, code:event.code));
       });
     } catch (e) {
       emit(DeviceReportsFailedState(error: e.toString()));

lib/pages/device_managment/wall_sensor/bloc/state.dart

@@ -42,7 +42,8 @@ class DeviceReportsLoadingState extends WallSensorState {}
 
 class DeviceReportsState extends WallSensorState {
   final DeviceReport deviceReport;
-  const DeviceReportsState({required this.deviceReport});
+  final String code;
+  const DeviceReportsState({required this.deviceReport, required this.code});
 }
 
 class DeviceReportsFailedState extends WallSensorState {

lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart

@@ -38,8 +38,10 @@ class WallSensorControls extends StatelessWidget with HelperResponsiveLayout {
           } else if (state is DeviceReportsState) {
             return ReportsTable(
               report: state.deviceReport,
-              thirdColumnTitle: "Value",
-              thirdColumnDescription: "Lux",
+              thirdColumnTitle:
+                  state.code == 'illuminance_value' ? "Value" : 'Status',
+              thirdColumnDescription:
+                  state.code == 'illuminance_value' ? "Lux" : null,
               onRowTap: (index) {},
               onClose: () {
                 context.read<WallSensorBloc>().add(BackToGridViewEvent());