Merge pull request #685 from KhalisFoundation/dev

Update Beta

CHANGELOG.md

@@ -1,9 +1,15 @@
 ## New Updates
 
-### 5.2 - _190617_
+### 5.2 - _190702_
 
 ### Added:
 
+- Check out the new Ceremonies tab - we've put every Shabad you need for an Anand Kaaraj in one place!
+  ![](./assets/img/help_images/desktop-ceremonies.png)
+
+
+- Make your live streams stand out with all new Bani Overlay themes!
+
 - Did you know SikhiToTheMax has keyboard shortcuts?
      - CTRL (or CMD for Mac) + / = Search bar
      - CTRL (or CMD for Mac) + 1 = Waheguru Slide
@@ -13,20 +19,12 @@
      - CTRL (or CMD for Mac) + 5 = Help Menu
      - CTRL (or CMD for Mac) + 6 = Shortcut Legend 
 
-
-- Check out the new Ceremonies tab - we've put every Shabad you need for an Anand Kaaraj in one place!
-  ![](./assets/img/help_images/desktop-ceremonies.png)
-
-- Make your live streams stand out with all new Bani Overlay themes!
-  ![](./assets/img/help_images/desktop-overlay-themes.png)
-
-
 ### Improved:
 
 - Expanded Vishraams to be supported on all themes
-- If you switch back and forth between Shabads (or Banis), history will now remember where you left off
+- Switching between Banis / Shabads is now much easier, history will remember where you left off
 - Fixed several bugs when using Chromecast
-- Bug fixes & UI enhancements
+- Bug fixes & UI enhancements 
 
 <br/>  
 <details><summary>See previous updates...</summary>

www/js/banidb/sqlite-search.js

@@ -193,7 +193,7 @@ const loadCeremony = CeremonyID =>
     db.all(
       `SELECT v.ID, v.Gurmukhi, v.LineNo, v.English, v.Transliteration,
       v.Visraam, v.Punjabi, v.SourceID, v.MainLetters,
-      c.Token, c.Gurmukhi as CeremonyGurmukhi,
+      c.Token, c.Gurmukhi as CeremonyGurmukhi, c.Transliteration as ceremonyTransliteration,
       cs.Custom, cs.VerseIDRangeEnd, cs.VerseIDRangeStart,
       cc.English AS ceremonyEnglish, v.PageNo 
       AS PageNo
@@ -211,7 +211,6 @@ const loadCeremony = CeremonyID =>
             const row = Object.assign({}, rawRow);
             row.Ceremony = {
               Token: row.Token,
-              Gurmukhi: row.CeremonyGurmukhi,
             };
             const customID = row.Custom;
             row.Custom = {
@@ -234,6 +233,10 @@ const loadCeremony = CeremonyID =>
 
             return row;
           });
+          if (!rowsMapped[0].Gurmukhi) {
+            rowsMapped[0].Custom.Gurmukhi = rows[0].CeremonyGurmukhi;
+            rowsMapped[0].Custom.Transliteration = rows[0].ceremonyTransliteration;
+          }
           resolve(rowsMapped);
         }
       },
@@ -326,7 +329,7 @@ const loadBani = (BaniID, BaniLength) =>
     }
     db.all(
       `SELECT v.ID, v.Gurmukhi, v.Visraam, v.MainLetters, v.English, v.Transliteration,
-      v.punjabiUni, v.punjabi,  v.SourceID, v.PageNo AS PageNo, c.Token, b.existsSGPC, b.existsMedium,
+      v.punjabiUni, v.punjabi,  v.SourceID, v.PageNo AS PageNo, c.Token, c.Gurmukhi as nameOfBani, b.existsSGPC, b.existsMedium,
       b.existsTaksal, b.existsBuddhaDal, b.MangalPosition
       FROM Verse v
       LEFT JOIN Banis_Shabad b ON v.ID = b.VerseID

www/js/search.js

@@ -702,7 +702,6 @@ module.exports = {
           if (rowDb.VerseIDRangeStart && rowDb.VerseIDRangeEnd) {
             row = banidb.loadVerses(rowDb.VerseIDRangeStart, rowDb.VerseIDRangeEnd);
           }
-
           row.sessionKey = `ceremony-${ceremonyID}`;
           return row;
         }),
@@ -742,7 +741,7 @@ module.exports = {
     banidb.loadBani(BaniID, baniLengthCols[baniLength]).then(rowsDb => {
       // create a unique shabadID for whole bani, and append it with length
       const shabadID = `${rowsDb[0].Token || rowsDb[0].Bani.Token}-${baniLength}`;
-      const nameOfBani = rowsDb[0].Gurmukhi || rowsDb[0].Bani.Gurmukhi;
+      const nameOfBani = rowsDb[0].nameOfBani || rowsDb[0].Bani.Gurmukhi;
       const thisBaniState = sessionStatesList[`bani-${BaniID}`];
       if (!historyReload) {
         if (thisBaniState && thisBaniState.resumePanktee && !LineID) {