Continued implementation for issue #249

craigsapp · Feb 11, 2024 · 86e7917 · 86e7917
1 parent d6071e7
commit 86e7917
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 3 deletions.
diff --git a/_includes/browse/filterBySearchFlags.js b/_includes/browse/filterBySearchFlags.js
@@ -24,14 +24,16 @@ POPC2.prototype.filterBySearchFlags = function (input) {
 
 	// Flags expected to be in alphabetical order:
 	// BASSOCONTINUO
+	// FINGERING
 	// IIIF
 	// MODERN
 	// SINGLE
 	// TEXT
 	let pattern = "";
 	let count = 0;
 	let count2 = 0;
-	if (fields.BASSOCONTINUO) { pattern += ".*F"; count++; }
+	if (fields.BASSOCONTINUO) { pattern += ".*B"; count++; }
+	if (fields.FINGERING)     { pattern += ".*F"; count++; }
 	if (fields.IIIF)          { pattern += ".*I"; count++; }
 	if (fields.MODERN)        { pattern += ".*M"; count++; }
 	if (fields.SINGLE)        { pattern += ".*S"; count++; }

diff --git a/_includes/browse/main.html b/_includes/browse/main.html
@@ -76,6 +76,7 @@
 {% include browse/toggleComposerSort.js            %}
 {% include browse/toggleDateSorting.js             %}
 {% include browse/toggleBassoContinuoScores.js     %}
+{% include browse/toggleFingeringScores.js         %}
 {% include browse/toggleIiifScores.js              %}
 {% include browse/toggleModernScores.js            %}
 {% include browse/toggleShelfmarkSort.js           %}

diff --git a/_includes/browse/toggleFingeringScores.js b/_includes/browse/toggleFingeringScores.js
@@ -0,0 +1,36 @@
+{% comment %}
+//
+// Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
+// Creation Date: Thu Aug 10 15:04:37 CEST 2023
+// Last Modified: Thu Aug 10 15:48:06 CEST 2023
+// Filename:      _includes/browse/toggleFingeringScores.js
+// Used by:       
+// Included in:   _includes/browse/main.html
+// Syntax:        ECMAScript 6
+// vim:           ts=3:nowrap
+//
+// Description:   Toggle displaying only modernized scores
+//
+{% endcomment %}
+
+POPC2.prototype.toggleFingeringScores = function () {
+	this.DebugMessageFunction();
+
+	if (popc2.IsBrowsePage()) {
+		popc2.VARS.SEARCH_FLAGS.FINGERING = !popc2.VARS.SEARCH_FLAGS.FINGERING;
+		let element = document.querySelector("#fintering-browse-button");
+		if (element) {
+			if (popc2.VARS.SEARCH_FLAGS.FINGERING) {
+				element.classList.add("highlight");
+			} else {
+				element.classList.remove("highlight");
+			}
+		}
+		popc2.doBrowseSearch();
+	}
+};
+
+Object.defineProperty(POPC2.prototype.toggleFingeringScores, "name", { value: "toggleFingeringScores" });
+
+
+
diff --git a/_includes/initialize/POPC2.js b/_includes/initialize/POPC2.js
@@ -132,6 +132,7 @@ function POPC2() {
 	this.VARS.SEARCH_FLAGS.MODERN        = false;  // Search only files with modernized scores.
 	this.VARS.SEARCH_FLAGS.IIIF          = false;  // Search only files with IIIF bounding boxes.
 	this.VARS.SEARCH_FLAGS.BASSOCONTINUO = false;  // Search only files with basso continuo figures.
+	this.VARS.SEARCH_FLAGS.FINGERING     = false;  // Search only files with fingerings.
 	this.VARS.SEARCH_FLAGS.TEXT          = 0;      // Search only files containg lyrical text.
 	                                               //   0 = search both texted and textless works.
 	                                               //   1 = search texted works.

diff --git a/_includes/navigator/toolbar-browse.html b/_includes/navigator/toolbar-browse.html
@@ -23,14 +23,19 @@
 		data-transatt="title:accessibility" onclick="popc2.displayInfoPage('access');">
 </div>
 
+<div id="date-browse-button" class="tab trans worknav-tool fas fa-d"
+		role="button" tabindex="0"
+		data-transatt="title:date_sort" onclick="popc2.toggleDateSorting();">
+</div>
+
 <div id="basso-continuo-browse-button" class="tab trans worknav-tool fas fa-b"
 		role="button" tabindex="0"
 		data-transatt="title:basso_continuo_scores" onclick="popc2.toggleBassoContinuoScores();">
 </div>
 
-<div id="date-browse-button" class="tab trans worknav-tool fas fa-d"
+<div id="date-browse-button" class="tab trans worknav-tool fas fa-f"
 		role="button" tabindex="0"
-		data-transatt="title:date_sort" onclick="popc2.toggleDateSorting();">
+		data-transatt="title:fingering_scores" onclick="popc2.toggleFingeringScores();">
 </div>
 
 <div id="iiif-browse-button" class="tab trans worknav-tool fas fa-i"

diff --git a/_includes/translations/basic.aton b/_includes/translations/basic.aton
@@ -62,6 +62,12 @@
 @PL:		Toggle list of scores with basso continuo figures
 @@END:		ENTRY
 
+@@BEGIN:	ENTRY
+@TAG:		fingering_scores
+@EN:		Toggle list of scores with fingerings
+@PL:		Toggle list of scores with fingerings
+@@END:		ENTRY
+
 @@BEGIN:	ENTRY
 @TAG:		date_sort
 @EN:		Toggle ordering of scores by upload/revision date