some more edge cases considered and implemented

sw/lib/addeventkottaspegel.dart

@@ -23,7 +23,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
   List<int> measurementOffsets = [0, 1000, 2000, 3000];  //Colors no, green, red, blue
 
   //Parameters which shall be added to the measurement event as json string data
-  List<String> measurementStatusItems = ['ok', 'broken', 'missing' 'tilted',];
+  List<String> measurementStatusItems = ['ok', 'broken', 'missing', 'tilted'];
   int measurementStatusId = -1;
 
   late String angleStatus;
@@ -33,6 +33,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
 
   bool syncGNSSData = true;
   bool _addButtonEnabled = true;
+  bool _eventAdded = false;
 
   bool displayAngle = true;
   bool displayOldLength = true;
@@ -78,7 +79,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
         event.currentEvent.latitude = "";
         event.currentEvent.longitude = "";
         event.currentEvent.elevation = "";
-        rawMeasurementValue = -1;
+        rawMeasurementValue = 0;
 
         debugPrint("Rest Query failed $e");
       }
@@ -167,12 +168,6 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
     event.currentEvent.label = configuration.labelConfig.prefix + configuration.labelConfig.cnt.toString();
     angleStatus = angleStatusItems[0];
 
-
-
-    //Set the device URN for the event fixed here!  TODO: create device in sensor, add to a collection!
-    //event.currentEvent.urn  TODO: set the urn here!
-    //event.currentEvent.urnId
-
     super.initState();
   }
 
@@ -251,7 +246,9 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
         if(_validateLatitude(event.currentEvent.latitude)){
           if(_validateLongitude(event.currentEvent.longitude)){
             if(_validateElevation(event.currentEvent.elevation)){
-              return true;
+              if(measurementStatusId >= 0 && measurementStatusId < measurementStatusItems.length) {
+                return true;
+              }
             }
           }
         }
@@ -340,7 +337,6 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
   Future<void> _storeCurrentMeasurementEvent(BuildContext context) async {
     final EventStoreInstance event = EventStoreInstance();
     final ConfigurationStoreInstance configuration = ConfigurationStoreInstance();
-    //TODO: validate all event fields to check if they fullfill the sensor.awi.de requirements for events.
 
     event.currentEvent.urn = 'station:neumayer_iii:snow_level_measure';
     event.currentEvent.urnId = 9094;  //TODO: this is a prototype. Shall later somehow configurable
@@ -358,35 +354,48 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
     };
 
     //TODO: extend Database and add payload field.
-
     debugPrint('Payload$data');
 
-
     await database.addEvent(event.currentEvent);
     HapticFeedback.vibrate(); //Feedback that adding event succeeded
-    _addButtonEnabled = true; //Activate button for add more events
 
-    setState(() {});
-    //_showAddSuccessOverlay(context);  //Show pop up to indicated adding event succeeded.
-    _showResultPopup(context, "Successfully created Event !", false );
-    //TODO: add flag and set/reset here! Use flag for disabling the "create event" button until _storeCurrentMeasurementEvent finished.
+    //Get next Label prefix, id and event timestamp
+    if (configuration.labelConfig.cntUp == true){
+      configuration.labelConfig.cnt++;
+    }else{
+      configuration.labelConfig.cnt--;
+    }
+    event.currentEvent.label = configuration.labelConfig.prefix + configuration.labelConfig.cnt.toString();
 
-    //Get next Label prefix and id
     var date = DateTime.now().toUtc();
     var isoDate = date.toIso8601String();
     event.currentEvent.startDate = isoDate;
     event.currentEvent.endDate = isoDate;
+
+    // Reset fields for next event
+    measurementStatusId = -1;
+    angleStatus = angleStatusItems[0];
+    lengthOld = 0;
+    lengthNew = 0;
+
+    await event.storeToSharedPrefs();
+    await configuration.storeToSharedPrefs();
+
+    _addButtonEnabled = true; //Activate button to add more events
+    _eventAdded = true; // Trigger popup in build method
+
+    setState(() {});
   }
 
   @override
   Widget build(BuildContext context) {
     /* Get singletons to access relevant data here.*/
-    final EventStoreInstance eventStore = EventStoreInstance();
+    final EventStoreInstance event = EventStoreInstance();
     final ConfigurationStoreInstance configuration = ConfigurationStoreInstance();
     String switchStatusText = "";
     String switchStatusTextLine2 = "";
 
-    if (true == eventStore.gnssSync){
+    if (true == event.gnssSync){
       switchStatusText = "External REST Data";
     }
     else{
@@ -400,7 +409,6 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
     }
 
     // Set visibility parameters
-    measurementStatusItems = ['ok', 'broken', 'missing' 'tilted',];
     displayAngle = false;
     displayOldLength = false;
     displayNewLength = false;
@@ -421,14 +429,13 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
       displayNewLength = true;
     }
 
-    // Validate Input and disable add button if input not correct
-    if (true == _validateInput()){
-      _addButtonEnabled = true;
-    }else{
-      _addButtonEnabled = false;
-    }
-
+    if (true == _eventAdded){
+      _eventAdded = false;
 
+      Future.delayed(Duration.zero,() {
+        _showResultPopup(context, "Successfully created Event !", false);
+      });
+    }
 
     if (configuration.initialized == true) {
       return Scaffold(
@@ -442,12 +449,12 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
               ],
             ),
             Switch(  //Enable showing all or only pending events. Default is to show only pending events
-                value: eventStore.gnssSync,
+                value: event.gnssSync,
                 onChanged: (value) {
-                  eventStore.gnssSync = value;
-                  debugPrint('Switched to:${eventStore.gnssSync}');
+                  event.gnssSync = value;
+                  debugPrint('Switched to:${event.gnssSync}');
                   accuracy = 0.0;
-                  if(eventStore.gnssSync){
+                  if(event.gnssSync){
                     // Get data from rest / raspberry pi
                     streamHandler.cancel();
                     startRest();
@@ -456,16 +463,12 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                     // Get data from internal GNSS
                     restQueryTimer.cancel();
                     startGNSS();
-                    rawMeasurementValue = -1; //Clear Raw Measurement value
+                    rawMeasurementValue = 0; //Clear Raw Measurement value
                   }
-                  setState(() {
-                    //refresh the UI
-                  });
+                  setState(() {});
                 }),
           ],
-
-        )
-        ,
+        ),
         body: SingleChildScrollView(
           child: Container(
             margin: const EdgeInsets.symmetric(horizontal: 5.0),
@@ -481,10 +484,10 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                     autovalidateMode: AutovalidateMode.onUserInteraction,
                     controller: TextEditingController(
                         text: ""
-                            "${eventStore.currentEvent.startDate.substring(11,19)} / "
-                            "${eventStore.currentEvent.latitude} / "
-                            "${eventStore.currentEvent.longitude} / "
-                            "${eventStore.currentEvent.elevation}"
+                            "${event.currentEvent.startDate.substring(11,19)} / "
+                            "${event.currentEvent.latitude} / "
+                            "${event.currentEvent.longitude} / "
+                            "${event.currentEvent.elevation}"
                     ),
                     decoration: const InputDecoration(
                       labelText: 'UTC / Lat / Long / Elv ',  //Example
@@ -508,14 +511,16 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                   ),
                   const SizedBox(height: 15.0),
                   TextFormField(
-                    initialValue: eventStore.currentEvent.label,
+                    controller: TextEditingController(
+                      text: event.currentEvent.label,
+                    ),
                     autovalidateMode: AutovalidateMode.always,
                     decoration: const InputDecoration(
                       border: OutlineInputBorder(),
                       labelText: 'Label',
                     ),
                     onChanged: (value){
-                      eventStore.currentEvent.label = value;
+                      event.currentEvent.label = value;
                       setState(() {});
                     },
                     validator: (value) {
@@ -608,12 +613,13 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                   const SizedBox(height: 15.0),
                   Visibility(
                     visible: displayOldLength,
-                    child:
+                    child: event.gnssSync ?
                     TextFormField(
                       readOnly: false,
-                      enabled: !eventStore.gnssSync,
+                      enabled: !event.gnssSync,
                       keyboardType: TextInputType.number,
                       autovalidateMode: AutovalidateMode.onUserInteraction,
+                      inputFormatters:[FilteringTextInputFormatter.allow(RegExp("[0-9]"))],
                       controller: TextEditingController(
                         text: lengthOld.toString(),
                       ),
@@ -621,11 +627,33 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                         labelText: 'old length',  //Example
                         border: OutlineInputBorder(),
                       ),
+                      validator: (value) {
+                        if (value == "") {
+                          return null; // Empty value is allowed
+                        }
+                        final number = num.tryParse(value!);
+                        if (number != null){
+                          return null;  // Elevation valid
+                        }
+                        return "Only numerical values [mm]";
+                      },
+                    ) :
+                    TextFormField(
+                      readOnly: false,
+                      enabled: !event.gnssSync,
+                      keyboardType: TextInputType.number,
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
+                      inputFormatters:[FilteringTextInputFormatter.allow(RegExp("[0-9]"))],
+                      initialValue: lengthOld.toString(),
+                      decoration: const InputDecoration(
+                        labelText: 'old length',  //Example
+                        border: OutlineInputBorder(),
+                      ),
                       onChanged: (value) {
                         lengthOld = int.parse(value);
                       },
                       onFieldSubmitted: (value){
-                        if (!eventStore.gnssSync) {
+                        if (!event.gnssSync) {
                           setState(() {});
                         }
                       },
@@ -639,7 +667,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                         }
                         return "Only numerical values [mm]";
                       },
-                    ),
+                    ) ,
                   ),
                   const SizedBox(height: 5.0),
                   Visibility(
@@ -651,7 +679,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.grey : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.grey : Colors.grey,
                             ),
                             onPressed: () {
                               lengthOld = rawMeasurementValue + measurementOffsets[0];
@@ -663,7 +691,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.green : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.green : Colors.grey,
                             ),
                             onPressed: () {
                               lengthOld = rawMeasurementValue + measurementOffsets[1];
@@ -676,7 +704,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.red : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.red : Colors.grey,
                             ),
                             onPressed: () {
                               lengthOld = rawMeasurementValue + measurementOffsets[2];
@@ -688,7 +716,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.blue : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.blue : Colors.grey,
                             ),
                             onPressed: () {
                               lengthOld = rawMeasurementValue + measurementOffsets[3];
@@ -702,12 +730,13 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                   const SizedBox(height: 15.0),
                   Visibility(
                     visible: displayNewLength,
-                    child:
+                    child: event.gnssSync ?
                     TextFormField(
                       readOnly: false,
-                      enabled: !eventStore.gnssSync,
+                      enabled: !event.gnssSync,
                       keyboardType: TextInputType.number,
                       autovalidateMode: AutovalidateMode.onUserInteraction,
+                      inputFormatters:[FilteringTextInputFormatter.allow(RegExp("[0-9]"))],
                       controller: TextEditingController(
                           text: lengthNew.toString()
                       ),
@@ -719,7 +748,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                         lengthNew = int.parse(value);
                       },
                       onFieldSubmitted: (value){
-                        if (!eventStore.gnssSync) {
+                        if (!event.gnssSync) {
                           setState(() {});
                         }
                       },
@@ -733,6 +762,28 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                         }
                         return "Only numerical values for elevation in [m]";
                       },
+                    ) :
+                    TextFormField(
+                      readOnly: false,
+                      enabled: !event.gnssSync,
+                      keyboardType: TextInputType.number,
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
+                      inputFormatters:[FilteringTextInputFormatter.allow(RegExp("[0-9]"))],
+                      initialValue: lengthNew.toString(),
+                      decoration: const InputDecoration(
+                        labelText: 'new length',  //Example
+                        border: OutlineInputBorder(),
+                      ),
+                      validator: (value) {
+                        if (value == "") {
+                          return null; // Empty value is allowed
+                        }
+                        final number = num.tryParse(value!);
+                        if (number != null){
+                          return null;  // Elevation valid
+                        }
+                        return "Only numerical values for elevation in [m]";
+                      },
                     ),
                   ),
                   const SizedBox(height: 5.0),
@@ -745,7 +796,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.grey : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.grey : Colors.grey,
                             ),
                             onPressed: () {
                               lengthNew = rawMeasurementValue + measurementOffsets[0];
@@ -757,7 +808,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.green : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.green : Colors.grey,
                             ),
                             onPressed: () {
                               lengthNew = rawMeasurementValue + measurementOffsets[1];
@@ -769,7 +820,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.red : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.red : Colors.grey,
                             ),
                             onPressed: () {
                               lengthNew = rawMeasurementValue + measurementOffsets[2];
@@ -781,7 +832,7 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                           ElevatedButton(
                             style: ElevatedButton.styleFrom(
                               padding: const EdgeInsets.symmetric(vertical: 20.0), //TODO: find a more dynamic solution without a fixed value
-                              primary: eventStore.gnssSync == true ? Colors.blue : Colors.grey,
+                              primary: event.gnssSync == true ? Colors.blue : Colors.grey,
                             ),
                             onPressed: () {
                               lengthNew = rawMeasurementValue + measurementOffsets[3];
@@ -794,14 +845,14 @@ class _AddEventKottasPegelPageState extends State<AddEventKottasPegel>  {
                   ),
                   const SizedBox(height: 15.0),
                   TextFormField(
-                    initialValue: eventStore.currentEvent.description,
+                    initialValue: event.currentEvent.description,
                     autovalidateMode: AutovalidateMode.always,
                     decoration: const InputDecoration(
                         border: OutlineInputBorder(),
                         labelText: 'Description'
                     ),
                     onChanged: (value){
-                      eventStore.currentEvent.description = value;
+                      event.currentEvent.description = value;
                       setState(() {});
                     },
                     validator: (value) {