Merge pull request #337 from sensebox/development

Sound Level Meter
sensebox · Feb 5, 2020 · 7b9180a · 7b9180a
2 parents 5b7bbbd + 772cfe3
commit 7b9180a
Show file tree

Hide file tree

Showing 8 changed files with 845 additions and 665 deletions.
diff --git a/app/components/leaflet.directive.js b/app/components/leaflet.directive.js
@@ -97,7 +97,7 @@
 
       var baselayer = L.tileLayer('@@OPENSENSEMAP_MAPTILES_URL', {
         subdomains: 'abc',
-        attribution: '&copy; <a href="http://osm.org/copyright" target="_blank">OpenStreetMap</a> contributors | Tiles &copy; <a href="http://www.mapbox.com/" target="_blank">Mapbox</a>',
+        attribution: '© <a href="https://www.mapbox.com/about/maps/">Mapbox</a> © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> <strong><a href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a></strong>',
         detectRetina: true,
         reuseTiles: true,
         maxZoom: 18

diff --git a/app/scripts/controllers/account.box.edit.script.js b/app/scripts/controllers/account.box.edit.script.js
@@ -17,6 +17,8 @@
     vm.showSerialPort = false;
     vm.soilDigitalPort = 'A';
     vm.showSoilDigitalPort = false;
+    vm.soundMeterPort = 'B';
+    vm.showSoundMeterPort = false;
     vm.compiling = false;
     vm.wifi = {
       ssid: '',
@@ -45,6 +47,12 @@
         vm.showSoilDigitalPort = true;
       }
 
+      if (boxData.sensorsArray.filter(function (s) {
+        return s.sensorType === 'SOUNDLEVELMETER';
+      }).length !== 0) {
+        vm.showSoundMeterPort = true;
+      }
+
       return getScript();
     }
 
@@ -58,6 +66,7 @@
       return AccountService.getScript(boxData._id, {
         serialPort: vm.serialPort,
         soilDigitalPort: vm.soilDigitalPort,
+        soundMeterPort: vm.soundMeterPort,
         ssid: vm.wifi.ssid,
         password: vm.wifi.password
       })

diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js
@@ -38,6 +38,7 @@
       },
       serialPort: 'Serial1',
       soilDigitalPort: 'A',
+      soundMeterPort: 'B',
       bmePhenomenon: 'tempHumiPress'
     };
 
@@ -178,6 +179,7 @@
       return AccountService.getScript(vm.newSenseBox.id, {
         serialPort: vm.newSenseBox.serialPort,
         soilDigitalPort: vm.newSenseBox.soilDigitalPort,
+        soundMeterPort: vm.newSenseBox.soundMeterPort,
         ssid: vm.wifi.ssid,
         password: vm.wifi.password
       })
@@ -323,6 +325,7 @@
       if (model.startsWith('homeV2')) {
         data.serialPort = vm.newModel.serialPort;
         data.soilDigitalPort = vm.newSenseBox.soilDigitalPort;
+        data.soundMeterPort = vm.newSenseBox.soundMeterPort;
       }
       AccountService.getScript(boxId, data)
         .then(function (data) {
@@ -395,7 +398,7 @@
         }
         if (vm.extensions.soundLevelMeter.id !== '') {
           vm.newSenseBox.sensorTemplates.push('soundlevelmeter');
-          vm.newSenseBox.soundLevelMeterPort = vm.extensions.soundLevelMeter.port;
+          vm.newSenseBox.soundMeterPort = vm.extensions.soundLevelMeter.port;
         }
       }
 

diff --git a/app/views/account.box.edit.script.html b/app/views/account.box.edit.script.html
@@ -35,6 +35,20 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
+    <div class="form-group" ng-if="script.showSoundMeterPort">
+      <label for="soundMeterPort">{{'SOUND_LEVEL'|translate}}<br/>{{'DIGITAL_PORT'|translate}}</label>
+      <div class="input-group">
+        <select type="text" class="form-control" id="soundMeterPort" ng-model="script.soundMeterPort"
+          ng-change="script.generateScript()">
+          <option value="A">A</option>
+          <option value="B">B</option>
+          <option value="C">C</option>
+        </select>
+        <div class="input-group-addon">
+          <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+        </div>
+      </div>
+    </div>
     <div class="form-group">
       <label for="ssid">WiFi SSID</label>
       <div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"

diff --git a/app/views/account.box.register.html b/app/views/account.box.register.html
@@ -419,7 +419,7 @@ <h3>{{'SENSORS' | translate}}</h3>
                                   </div>
                                 </div>
                               </div>
-                              <!-- <div class="row">
+                              <div class="row">
                                 <div class="col-lg-8 col-md-8 col-sm-8 col-xs-6"
                                   style="border-right: 1px solid #e1e4e8;">
                                   <div style="text-align: left;">
@@ -430,7 +430,7 @@ <h3>{{'SENSORS' | translate}}</h3>
                                       <label for="soundLevelMeter"> </label>
                                     </div>
                                     <img
-                                      src="https://sensebox.kaufen/api/public/uploads/1572259222502-SMT50_freigestellt_02.png"
+                                      src="https://sensebox.kaufen/api/public/uploads/1579187023927-176092104_illustrator_02_gimp%20overlay_cropped.png"
                                       style="vertical-align: middle; height: 90px; width: 90px;" />
                                     <span style="vertical-align: middle;">Lautstärke</span>
                                   </div>
@@ -449,7 +449,7 @@ <h3>{{'SENSORS' | translate}}</h3>
                                     </div>
                                   </div>
                                 </div>
-                              </div>      -->
+                              </div>     
                             </div>
                           </div>
                         </li>
@@ -739,6 +739,20 @@ <h4>Bodentemperatur</h4>
                         </div>
                       </div>
                     </div>
+                    <div class="col-sm-3 col-md-3 col-lg-3">
+                      <div class="thumbnail">
+                        <img
+                          src="https://sensebox.kaufen/api/public/uploads/1579187023927-176092104_illustrator_02_gimp%20overlay_cropped.png"
+                          style="vertical-align: middle; height: 90px; width: 90px;" alt="">
+                        <div class="caption">
+                          <h4>{{'SOUND_LEVEL'|translate}}</h4>
+                          <p>
+                            <button type="button" class="btn btn-success"
+                              ng-click="register.addSensorTemplate('soundlevelmeter')">{{'ADD_SENSOR'|translate}}</button>
+                          </p>
+                        </div>
+                      </div>
+                    </div>
                   </div>
                   <br>
                   <hr>
@@ -1348,6 +1362,20 @@ <h5 ng-bind-html="'COMPILE_SKETCH'|translate"></h5>
                     </div>
                   </div>
                 </div>
+                <div class="form-group">
+                  <label for="soundMeterPort">{{'SOUND_LEVEL'|translate}} {{'DIGITAL_PORT'|translate}}</label>
+                  <div class="input-group">
+                    <select type="text" class="form-control" id="soundMeterPort" ng-model="register.newSenseBox.soundMeterPort"
+                      ng-change="register.generateScript()">
+                      <option value="A">A</option>
+                      <option value="B">B</option>
+                      <option value="C">C</option>
+                    </select>
+                    <div class="input-group-addon">
+                      <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+                    </div>
+                  </div>
+                </div>
                 <div class="form-group">
                   <label for="ssid">WiFi SSID</label>
                   <div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"

diff --git a/app/views/account.dashboard.html b/app/views/account.dashboard.html
@@ -8,7 +8,7 @@ <h3 translate="REGISTERED_BOXES" translate-values="{count: dashboard.boxes.lengt
           <p>
             <a ui-sref="account.register" class="btn btn-primary"
               role="button">{{'ACCOUNT_NEW_SENSEBOX' | translate}}</a>
-            <a href="https://books.sensebox.de" target="_blank" class="btn btn-default" role="button">{{'DOCUMENTATION'
+            <a href="https://sensebox.de/de/go-home" target="_blank" class="btn btn-default" role="button">{{'DOCUMENTATION'
               | translate}}</a>
             <a href="https://forum.sensebox.de" target="_blank" class="btn btn-default" role="button">Forum</a>
           </p>