[bugfix] Make sure the tei:change element is added to the TEI document in the correct place

Author: adamretter

src/main/formGenerator/generateXForm.xsl

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:sc="http://www.ascc.net/xml/schematron" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:srophe="https://srophe.app" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:local="http://syriaca.org/ns" version="3.0">
     <!-- 
-        Generate XForms from a schema. Designed for TEI XML creation and editing. Run as an eXist-db application. 
-        Resulting TEI can be saved to eXist-db, downloaded to local filesystem, or saved to a GitHub repository
+        Generate XForms from a schema. Designed for TEI XML creation and editing. Run as an Elemental application.
+        Resulting TEI can be saved to Elemental, downloaded to local filesystem, or saved to a GitHub repository
         
         Expectations: 
         
@@ -12,7 +12,7 @@
             - Local schema constrainst, such as an ODD file
             - Main schema as an ODD file
             - XSLTForms
-            - eXist-db 
+            - Elemental
             
         Version: 1.72 Beta 
             -1.23 marks a major redesign
@@ -652,9 +652,6 @@
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
                             -->
-                            <xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
-                            <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
-                            <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>
                             <xf:setvalue ref="instance('i-new')//*:new" value="'true'"/>
                         </xf:action>
                         <xf:message level="modeless" ev:event="xforms-submit-error"> Submit error. </xf:message>
@@ -669,9 +666,6 @@
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]" value="instance('i-user')//*:fullName"/>
                             <xf:setvalue ref="instance('i-rec')//*:titleStmt/*:editor[last()]/@xml:id" value="instance('i-user')//*:user"/>
                             -->
-                            <xf:insert ref="instance('i-rec')//*:revisionDesc/child::*" at="1" origin="instance('i-admin')//*:change[1]" position="before"/>
-                            <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@who" value="concat('#',instance('i-user')//*:user)"/>
-                            <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]/@when" value="getXMLDate()"/>
                             <xf:setvalue ref="instance('i-new')//*:new" value="'false'"/>
                         </xf:action>    
                         <xf:message level="modeless" ev:event="xforms-submit-error"> Submit error. </xf:message>
@@ -719,6 +713,10 @@
 
                     <!-- Save record to github -->
                     <xf:submission id="s-github" ref="instance('i-rec')" replace="instance" instance="i-submission" method="post">
+                        <xf:action ev:event="xforms-submit">
+                            <!-- Set the change details in the record before saving -->
+                            <xf:insert context="instance('i-rec')//tei:teiHeader/tei:revisionDesc" nodeset="tei:change" at="1" position="before" origin="instance('i-admin')/tei:change"/>
+                        </xf:action>
                         <xf:resource value="concat('services/submit.xql?type=github','&amp;new=',string(instance('i-new')//*:new),'&amp;eXistCollection=',string(instance('i-submission-params')//*:saveOptions/*:option[@name='exist-db']/*:parameter[@name='eXistCollection']),'&amp;githubRepoName=',string(instance('i-submission-params')//*:parameter[@name='githubRepoName']),'&amp;githubPath=',string(instance('i-submission-params')//*:parameter[@name='githubPath']),'&amp;githubOwner=',string(instance('i-submission-params')//*:parameter[@name='githubOwner']),'&amp;githubBranch=',string(instance('i-submission-params')//*:parameter[@name='githubBranch']))"/>
                         <xf:action ev:event="xforms-submit-done">
                             <xf:message ref="instance('i-submission')//*:message"/>
@@ -1104,7 +1102,7 @@
                                     </div>
                                     <div class="input-group mb-3">
                                         <h3>Credits</h3>
-                                        <xf:repeat ref="instance('i-rec')//*:revisionDesc/*:change" id="changeRec">
+                                        <xf:repeat ref="instance('i-rec')//tei:teiHeader/tei:revisionDesc/tei:change" id="changeRec">
                                             <div class="change">
                                                 <xf:output value="concat(@who,' (', @when,'): ', .)"/>
                                             </div>
@@ -1156,21 +1154,25 @@
                                         <div class="fileLoading">
                                         <p>Write a one-sentence description of the changes you made to the file.</p>
                                         <div class="input-group mb-3 full-width">
-                                            <xf:textarea ref="instance('i-rec')//*:revisionDesc/*:change[1]" class="large-textarea"/>
+                                            <xf:textarea ref="instance('i-admin')/tei:change" class="large-textarea"/>
                                         </div>
                                         <div class="mb-3">
                                             <xf:trigger class="btn btn-outline-secondary" appearance="minimal">
                                                 <xf:label> Save</xf:label>
                                                 <xf:action ev:event="DOMActivate">
+                                                    <xf:setvalue ref="instance('i-admin')/tei:change/@who" value="concat('#', instance('i-user')//*:user)"/>
+                                                    <xf:setvalue ref="instance('i-admin')/tei:change/@when" value="getXMLDate()"/>
                                                     <xf:toggle case="changeElementHide" ev:event="DOMActivate"/>
                                                     <xf:send submission="s-github"/>
                                                 </xf:action>
                                             </xf:trigger>
                                             <xf:trigger class="btn btn-outline-secondary" appearance="minimal">
                                                 <xf:label> Cancel</xf:label>
                                                 <xf:action ev:event="DOMActivate">
+                                                    <xf:setvalue ref="instance('i-admin')/tei:change/@who" value="'#'"/>
+                                                    <xf:setvalue ref="instance('i-admin')/tei:change/@when" value="''"/>
+                                                    <xf:setvalue ref="instance('i-admin')/tei:change" value="''"/>
                                                     <xf:toggle case="changeElementHide" ev:event="DOMActivate"/>
-                                                    <xf:setvalue ref="instance('i-rec')//*:revisionDesc/*:change[1]" value="''"/>
                                                 </xf:action>
                                             </xf:trigger>   
                                         </div>