Fixed bug where "questionnaire" was stupidly renamed to "storyForm" i…

…n a place that caused the data not to be picked up when printing story cards. Ready to release as v1.5.14.
pdfernhout · Mar 5, 2022 · 1f7b8a5 · 1f7b8a5
1 parent edc0909
commit 1f7b8a5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/TODO.txt b/TODO.txt
@@ -162,6 +162,10 @@ M When import story form, hundreds of triples can be generated which take minute
 
 ==== DONE
 
+--- Release 1.5.14
+
+Fixed: Bug in printing story cards where story-form question-answers were not appearing.
+
 --- Release 1.5.13
 
 Fixed: Bug where choose-questions-for-story-form widget was not matching up questions correctly if question short names had extra (leading or trailing) blank spaces. (Now any extra blank spaces are trimmed off.)

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "NarraFirma",
   "description": "NarraFirma webapp for Participatory Narrative Inquiry (PNI)",
-  "version": "1.5.13",
+  "version": "1.5.14",
   "keywords": [
     "JavaScript",
     "NarraFirma",

diff --git a/webapp/source/surveyBuilderMithril.ts b/webapp/source/surveyBuilderMithril.ts
@@ -614,7 +614,7 @@ export function buildSurveyForm(surveyDiv, storyForm, doneCallback, surveyOption
     const surveyResult = {
         __type: "org.workingwithstories.storyFormResponse",
         // TODO: Think about whether to include entire storyForm or something else perhaps
-        storyForm: storyForm,
+        questionnaire: storyForm,
         responseID: generateRandomUuid("storyFormResponse"),
         stories: [],
         language: currentLanguage,

diff --git a/webapp/source/surveyCollection.ts b/webapp/source/surveyCollection.ts
@@ -207,7 +207,17 @@ export function getStoriesForStoryCollection(storyCollectionIdentifier, includeI
                 }
 
                 // Add some fields for displaying information
-                story.questionnaire = surveyResult.questionnaire;
+                // note: we must check both field names (questionnaire and storyForm)
+                // because I stupidly changed "questionnaire" to "storyForm" 
+                // without realizing I was messing up references in the data;
+                // I put it back later, but either name could be in legacy data
+                if (surveyResult.questionnaire) {
+                    story.questionnaire = surveyResult.questionnaire;
+                } else if (surveyResult.storyForm) {
+                    story.questionnaire = surveyResult.storyForm;
+                } else {
+                    console.log("ERROR: story has no story form reference.")
+                }
                 story.indexInStoryCollection = ++numStoriesAddedForCollection;
                 story.storyCollectionIdentifier = storyCollectionIdentifier;
                 const wrappedStory = new Story(story);

diff --git a/webapp/source/versions.ts b/webapp/source/versions.ts
@@ -3,7 +3,7 @@ import kludgeForUseStrict = require("./kludgeForUseStrict");
 
 // Return current versions used by application  
 const versions = {
-    narrafirmaApplication: "1.5.13",
+    narrafirmaApplication: "1.5.14",
 
     questionnaireContentType: "org.workingwithstories.NarraFirmaQuestionnaire",
     questionnaireContentVersion: "0.2.0",

diff --git a/wordpress-plugin/narrafirma/narrafirma.php b/wordpress-plugin/narrafirma/narrafirma.php
@@ -4,7 +4,7 @@
 Plugin URI: http://narrafirma.com
 Description: Participatory Narrative Inquiry in a box. Gather stories and make sense of challenges and opportunities in your community or organization.
 Author: Cynthia F. Kurtz and Paul D. Fernhout
-Version: 1.5.13
+Version: 1.5.14
 Author URI: http://cfkurtz.com
 License: GPLv2 or later
 */
@@ -29,7 +29,7 @@
 
 defined( 'ABSPATH' ) or die( 'Plugin must be run from inside WordPress' );
 
-$NARRAFIRMA_VERSION = '1.5.13';
+$NARRAFIRMA_VERSION = '1.5.14';
 
 $pointrelServerVersion = "pointrel20150417-0.0.4-wp";
 

diff --git a/wordpress-plugin/narrafirma/readme.txt b/wordpress-plugin/narrafirma/readme.txt
@@ -9,7 +9,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Requires at least: 4.3.1
 Tested up to: 5.9.1
 Stable tag: trunk
-Version: 1.5.13
+Version: 1.5.14
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -106,6 +106,10 @@ We strongly suggest that you set up any web site on which you intend to install
 
 == Changelog ==
 
+= 1.5.14 =
+
+Fixed: Bug in printing story cards where story-form question-answers were not appearing.
+
 = 1.5.13 =
 
 Fixed: Bug where choose-questions-for-story-form widget was not matching up questions correctly if question short names had extra (leading or trailing) blank spaces. (Now any extra blank spaces are trimmed off.)
@@ -571,6 +575,9 @@ change logs, see the [GitHub repository](https://github.com/pdfernhout/narrafirm
 
 == Upgrade Notice ==
 
+= 1.5.14 =
+This minor upgrade fixes a bug in printing story cards where story-form question-answers were not appearing.
+
 = 1.5.13 =
 This minor upgrade fixes two tiny bugs you might have run into if you had extra (blank) leading or trailing spaces in your question short names, or if you had extra (empty) lines in your available-answers lists. NF now deals more elegantly with both situations.