Merge branch 'RP' into develop

admin/app/translations.js

@@ -30,7 +30,8 @@ function config($translateProvider) {
                     ONPEAK: 'On-peak',
                     OFFPEAK: 'Off-peak',
                     MIDPEAK: 'Mid-peak'
-                }
+                },
+                QR_CODE: 'QR Code'
             },
             FDD: {
                 ID: 'ID',
@@ -1015,7 +1016,8 @@ function config($translateProvider) {
                     ONPEAK: '峰',
                     OFFPEAK: '谷',
                     MIDPEAK: '平'
-                }
+                },
+                QR_CODE:"二维码"
             },
             FDD: {
                 ID: 'ID',
@@ -2007,7 +2009,8 @@ function config($translateProvider) {
                     ONPEAK: 'Gipfel',
                     OFFPEAK: 'Senke',
                     MIDPEAK: 'Niveau'
-                }
+                },
+                QR_CODE: 'QR Code'
             },
             FDD: {
                 ID: 'ID',
@@ -2491,8 +2494,7 @@ function config($translateProvider) {
                 MASTER_METER: 'Überlegenes Messgerät',
                 SELECT_MASTER_METER: 'Wählen Sie das übergeordnete Messgerät aus',
                 TREE_VIEW: 'Baumsicht',
-                CHILD_METERS: 'Unterer Füllstandsmesser',
+                CHILD_METERS: 'Unterer Füllstandsmesser'
-                QR_CODE: 'QR Code'
             },
             SENSOR: {
                 ADD_SENSOR: 'Sensor hinzufügen',

admin/views/settings/combinedequipment/combinedequipment.model.html

@@ -49,6 +49,13 @@
                   </div>
               </div>
           </div>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+          <div class="col-sm-8">
+              <div>
+                   <qrcode data="{{combinedequipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+              </div>
+          </div>
+        </div>
         </form>
     </div>
     <div class="modal-footer">

admin/views/settings/equipment/equipment.model.html

@@ -49,6 +49,13 @@
                   </div>
               </div>
           </div>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+              <div class="col-sm-8">
+                  <div>
+                       <qrcode data="{{equipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+          </div>
         </form>
     </div>
     <div class="modal-footer">

admin/views/settings/meter/meter.model.html

@@ -101,10 +101,10 @@
                   </div>
               </div>
             </div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.QR_CODE' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
              <div class="col-sm-8">
                   <div>
-                       <qrcode data="{{meter.qrcode}}" version="1" error-correction-level="L" size="200" color="#fff" background="#000" download></qrcode>
+                       <qrcode data="{{meter.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
                   </div>
               </div>
             </div>

admin/views/settings/shopfloor/shopfloor.model.html

@@ -62,6 +62,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{shopfloor.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">

admin/views/settings/space/space.model.html

@@ -111,7 +111,13 @@
                     </div>
                 </div>
             </div>
-
+            <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-8">
+                  <div>
+                       <qrcode data="{{space.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">

admin/views/settings/store/store.model.html

@@ -98,6 +98,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{store.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">

admin/views/settings/tenant/tenant.model.html

@@ -132,6 +132,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+              <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{tenant.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">