use correct term for adjustment, changed unit descriptors

aschet · Dec 9, 2021 · 9d349a1 · 9d349a1
1 parent 5faeedf
commit 9d349a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/en/index.html b/en/index.html
@@ -23,7 +23,7 @@
 <div data-role="page" id="pcalculation">
     <div data-role="header">
         <h1>Refractometer-Calculator</h1>
-        <a href="#pcalibration" data-role="button" data-icon="gear" class="ui-btn-right">Calibration</a>
+        <a href="#pcalibration" data-role="button" data-icon="gear" class="ui-btn-right">Adjustment</a>
     </div>
     <div role="main" class="ui-content">
         <form>
@@ -77,7 +77,7 @@ <h1>Refractometer-Calculator</h1>
                     <td id="caloutput"></td>
                 </tr>
                 <tr>
-                    <td>Calibration:</td>
+                    <td>Adjustment:</td>
                     <td id="caliboutput"></td>
                 </tr>                                                                               
             </tbody>
@@ -87,7 +87,7 @@ <h1>Refractometer-Calculator</h1>
 <div data-role="page" id="pcalibration">
     <div data-role="header">
         <a href="#pcalculation" data-role="button" data-icon="back">Back</a>        
-        <h1>Calibration</h1>
+        <h1>Adjustment</h1>
         <a href="#pdetails" data-role="button" data-icon="plus" name="btnadd" id="btnadd">Add</a>
     </div>
     <div role="main" class="ui-content">

diff --git a/index.html b/index.html
@@ -18,7 +18,7 @@
 <div data-role="page" id="pcalculation">
     <div data-role="header">
         <h1>Refraktometer-Rechner</h1>
-        <a href="#pcalibration" data-role="button" data-icon="gear" class="ui-btn-right">Kalibrierung</a>
+        <a href="#pcalibration" data-role="button" data-icon="gear" class="ui-btn-right">Justierung</a>
     </div>
     <div role="main" class="ui-content">
         <form>
@@ -72,7 +72,7 @@ <h1>Refraktometer-Rechner</h1>
                     <td id="caloutput"></td>
                 </tr>
                 <tr>
-                    <td>Kalibrierung:</td>
+                    <td>Justierung:</td>
                     <td id="caliboutput"></td>
                 </tr>                                                                               
             </tbody>
@@ -82,7 +82,7 @@ <h1>Refraktometer-Rechner</h1>
 <div data-role="page" id="pcalibration">
     <div data-role="header">
         <a href="#pcalculation" data-role="button" data-icon="back">Zurück</a>        
-        <h1>Kalibrierung</h1>
+        <h1>Justierung</h1>
         <a href="#pdetails" data-role="button" data-icon="plus" name="btnadd" id="btnadd">Hinzufügen</a>
     </div>
     <div role="main" class="ui-content">

diff --git a/main.js b/main.js
@@ -337,15 +337,15 @@ function textify2(value1, unit1, value2, unit2) {
 function textifyExtract(value, unit, valueSG = NaN) {
     if (isNaN(valueSG))
         valueSG = pToSG(value);
-    return concat(textify(value, unit), textify(valueSG, "", 3));
+    return concat(textify(value, unit), textify(valueSG, "SG", 3));
 }
 
 function updateTable(result) {
-    $('#abvoutput').html(textify2(result.abv, "vol %", result.abw, "%"));            
+    $('#abvoutput').html(textify2(result.abv, "%v/v", result.abw, "%w/w"));            
     $('#oeoutput').html(textifyExtract(result.oe, "°P"));
-    $('#aeoutput').html(textifyExtract(result.ae, "g/100g", result.fg));
+    $('#aeoutput').html(textifyExtract(result.ae, "%w/w", result.fg));
     $('#adfoutput').html(textify(result.adf, "%"));            
-    $('#reoutput').html(textifyExtract(result.re, "g/100g"));
+    $('#reoutput').html(textifyExtract(result.re, "%w/w"));
     $('#rdfoutput').html(textify(result.rdf, "%"));
     $('#caloutput').html(textify2(result.kj, "kJ", result.kcal, "kcal"));
     $('#caliboutput').html(calibration.getType());