Correcting Hash(PassKey) fields.

index.v2.html

@@ -41,14 +41,14 @@
                         <tr><td class="input-label">Doses</td><td><input id="qr-badge-required_doses" type="text" placeholder="1, 2, 3, ..."/></td></tr>
                         <tr><td class="input-label">Next Dose</td><td><input id="qr-badge-next_dose_in_days" type="text" placeholder="21, 28, ..."/></td></tr>
                         <tr><td class="input-label">Vaccinator</td><td><input id="qr-badge-vacinatorid" type="text" placeholder="Pharmacy Name, City, ..."/></td></tr>
-                        <tr><td class="input-label">VaccineeID</td><td><input id="qr-badge-vaccineeid" type="text" placeholder="User Hash"/></td></tr>
+                        <tr><td class="input-label">PassKey</td><td><input id="qr-badge-vaccineeid" type="text" placeholder="User Hash"/></td></tr>
                     </table>
                 </div>
                 <div class="quarter">
                     <h4>Status</h4>
                     <table>
                         <tr><td class="input-label">Doses</td><td><input id="qr-status-vaccinated" type="text" placeholder="0,1,2"/></td></tr>
-                        <tr><td class="input-label">VaccineeID</td><td><input id="qr-status-vaccineeid" type="text" placeholder="617 .."/></td></tr>
+                        <tr><td class="input-label">PassKey</td><td><input id="qr-status-vaccineeid" type="text" placeholder="User Hash"/></td></tr>
                     </table>
                 </div>
                 
@@ -182,6 +182,14 @@ uku7JUXcVpt08DFSceCEX9unCuMcT72rAQlLpdZir876
                 
                 signAndDisplayQR("qr-coupon", "healthpasscoupon", "SHA256", prikey, pubkey, messageCoupon);
 
+                // PassKey
+                var messagePassKey = "name="+e("qr-passkey-name").value;
+                messagePassKey += addIfExists("&phone=", "qr-passkey-phone");
+                messagePassKey += addIfExists("&dob=", "qr-passkey-dob");
+                messagePassKey += addIfExists("&salt=", "qr-passkey-salt");
+
+                signAndDisplayQR("qr-passkey", "healthpasskey", "SHA256", prikey, pubkey, messagePassKey);
+
                 // Badge
                 var messageBadge = "date="+e("qr-badge-date").value;
                 messageBadge += addIfExists("&vaccinee=", "qr-badge-vaccineeid");
@@ -197,14 +205,6 @@ uku7JUXcVpt08DFSceCEX9unCuMcT72rAQlLpdZir876
 
                 signAndDisplayQR("qr-badge", "healthpassbadge", "SHA256", prikey, pubkey, messageBadge);
 
-                // PassKey
-                var messagePassKey = "name="+e("qr-passkey-name").value;
-                messagePassKey += addIfExists("&phone=", "qr-passkey-phone");
-                messagePassKey += addIfExists("&dob=", "qr-passkey-dob");
-                messagePassKey += addIfExists("&salt=", "qr-passkey-salt");
-
-                signAndDisplayQR("qr-passkey", "healthpasskey", "SHA256", prikey, pubkey, messagePassKey);
-
                 // Status
                 var messageStatus = "vaccinated="+e("qr-status-vaccinated").value;
                 messageStatus += addIfExists("&vaccineeid=", "qr-status-vaccineeid");