From a9ffa552958c81fec6884d8021df318bfe996191 Mon Sep 17 00:00:00 2001
From: Chris <chris.godwin.ala@gmail.com>
Date: Fri, 25 Nov 2022 08:20:40 +1100
Subject: [PATCH] Added optional formVersion to output model rendering
 templates #168

---
 grails-app/views/output/_outputJSModel.gsp  | 2 +-
 grails-app/views/output/_readOnlyOutput.gsp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/grails-app/views/output/_outputJSModel.gsp b/grails-app/views/output/_outputJSModel.gsp
index c19c1d02..605f1934 100644
--- a/grails-app/views/output/_outputJSModel.gsp
+++ b/grails-app/views/output/_outputJSModel.gsp
@@ -1,5 +1,5 @@
 <asset:script>
-    <g:set var="outputNameAsIdentifer" value="${md.toSingleWord([name: outputName])}"/>
+    <g:set var="outputNameAsIdentifer" value="${md.toSingleWord([name: outputName+(formVersion?:'')])}"/>
 
     ecodata.forms["${outputNameAsIdentifer + 'ViewModel'}"] = function (output, dataModel, context, config) {
 
diff --git a/grails-app/views/output/_readOnlyOutput.gsp b/grails-app/views/output/_readOnlyOutput.gsp
index fe60b2a3..8928be86 100644
--- a/grails-app/views/output/_readOnlyOutput.gsp
+++ b/grails-app/views/output/_readOnlyOutput.gsp
@@ -1,5 +1,5 @@
-<g:set var="blockId" value="${divId?:(activity.activityId+fc.toSingleWord([name: outputName]))}"/>
-<g:set var="output" value="${activity.outputs.find {it.name == outputName}}"/>
+<g:set var="blockId" value="${divId?:(activity.activityId+fc.toSingleWord([name: outputName+(formVersion?:'')]))}"/>
+<g:set var="output" value="${output ?: activity.outputs.find {it.name == outputName}}"/>
 <g:if test="${!output}">
     <g:set var="output" value="[name: outputName]"/>
 </g:if>
@@ -16,7 +16,7 @@
     <asset:script>
         $(function(){
 
-            var viewModelName = "${fc.toSingleWord(name:outputName)}ViewModel";
+            var viewModelName = "${fc.toSingleWord(name:outputName+(formVersion?:''))}ViewModel";
             var viewModelInstance = "${blockId}Instance";
 
             var output = <fc:modelAsJavascript model="${output}"/>;