Allow adding citation when creating new objects

gramps-project · Jan 5, 2024 · e6323ac · e6323ac
1 parent 0bb00cd
commit e6323ac
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/src/mixins/GrampsjsNewEventMixin.js b/src/mixins/GrampsjsNewEventMixin.js
@@ -47,6 +47,8 @@ export const GrampsjsNewEventMixin = superClass =>
           .strings="${this.strings}"
         ></grampsjs-form-select-object-list>
 
+        ${this._renderCitationForm()}
+
         <div class="spacer"></div>
         <grampsjs-form-private
           id="private"

diff --git a/src/views/GrampsjsViewNewEvent.js b/src/views/GrampsjsViewNewEvent.js
@@ -38,6 +38,7 @@ export class GrampsjsViewNewEvent extends GrampsjsNewEventMixin(
   }
 
   _handleFormData(e) {
+    super._handleFormData(e)
     this.checkFormValidity()
     const originalTarget = e.composedPath()[0]
     if (originalTarget.id === 'event-type') {

diff --git a/src/views/GrampsjsViewNewFamily.js b/src/views/GrampsjsViewNewFamily.js
@@ -59,6 +59,8 @@ export class GrampsjsViewNewFamily extends GrampsjsViewNewObject {
       >
       </grampsjs-form-select-type>
 
+      ${this._renderCitationForm()}
+
       <div class="spacer"></div>
       <grampsjs-form-private
         id="private"

diff --git a/src/views/GrampsjsViewNewObject.js b/src/views/GrampsjsViewNewObject.js
@@ -146,6 +146,19 @@ export class GrampsjsViewNewObject extends GrampsjsView {
     `
   }
 
+  _renderCitationForm() {
+    return html`
+      <h4 class="label">${this._('Citation')}</h4>
+
+      <grampsjs-form-select-object-list
+        multiple
+        id="object-citation"
+        objectType="citation"
+        .strings="${this.strings}"
+      ></grampsjs-form-select-object-list>
+    `
+  }
+
   _updateData() {
     this.loading = true
     this.loadingTypes = true
@@ -206,11 +219,17 @@ export class GrampsjsViewNewObject extends GrampsjsView {
       this.data = {...this.data, private: e.detail.checked}
     }
     if (
-      ['author', 'pubinfo', 'abbrev', 'page', 'desc'].includes(
+      ['author', 'pubinfo', 'abbrev', 'page', 'desc', 'description'].includes(
         originalTarget.id
       )
     ) {
       this.data = {...this.data, [originalTarget.id]: e.detail.data}
     }
+    if (originalTarget.id === 'object-citation-list') {
+      this.data = {
+        ...this.data,
+        citation_list: e.detail.data ?? [],
+      }
+    }
   }
 }
diff --git a/src/views/GrampsjsViewNewPerson.js b/src/views/GrampsjsViewNewPerson.js
@@ -13,7 +13,7 @@ const gender = {
   0: 'Female',
 }
 
-const dataDefault = {_class: 'Person', gender: 2}
+const dataDefault = {_class: 'Person', gender: 2, citation_list: []}
 
 export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
   constructor() {
@@ -80,6 +80,8 @@ export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
         .strings="${this.strings}"
       ></grampsjs-form-select-object-list>
 
+      ${this._renderCitationForm()}
+
       <div class="spacer"></div>
       <grampsjs-form-private
         id="private"
@@ -153,6 +155,7 @@ export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
           _class: 'Event',
           handle: handleBirth,
           type: {_class: 'EventType', string: birthString},
+          citation_list: person.citation_list ?? [],
         },
       ]
     }
@@ -169,6 +172,7 @@ export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
           _class: 'Event',
           handle: handleDeath,
           type: {_class: 'EventType', string: deathString},
+          citation_list: person.citation_list ?? [],
         },
       ]
     }
@@ -188,12 +192,14 @@ export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
         _class: 'Event',
         handle: handleBirth,
         type: {_class: 'EventType', string: birthString},
+        citation_list: person.citation_list ?? [],
       },
       {
         ...death,
         _class: 'Event',
         handle: handleDeath,
         type: {_class: 'EventType', string: deathString},
+        citation_list: person.citation_list ?? [],
       },
     ]
   }

diff --git a/src/views/GrampsjsViewNewPlace.js b/src/views/GrampsjsViewNewPlace.js
@@ -55,6 +55,8 @@ export class GrampsjsViewNewPlace extends GrampsjsViewNewObject {
         .strings="${this.strings}"
       ></grampsjs-form-select-object-list>
 
+      ${this._renderCitationForm()}
+
       <div class="spacer"></div>
       <grampsjs-form-private
         id="private"