Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep for new Person dialog #575

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Move new Person form to mixin
cajturner committed Jan 20, 2025
commit ed04bd53f6917648c2d118eceb66acd3956ad5e9
85 changes: 85 additions & 0 deletions src/mixins/GrampsjsNewPersonMixin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import {html} from 'lit'

import '@material/mwc-textfield'

import '../components/GrampsjsFormSelectDate.js'
import '../components/GrampsjsFormSelectObjectList.js'
import '../components/GrampsjsFormSelectType.js'
import '../components/GrampsjsFormPrivate.js'

const gender = {
2: 'Unknown',
1: 'Male',
0: 'Female',
}

export const GrampsjsNewPersonMixin = superClass =>
class extends superClass {
handleGender(e) {
this.data = {...this.data, gender: parseInt(e.target.value, 10)}
}

renderForm() {
return html`
<h4 class="label">${this._('Name')}</h4>
<grampsjs-form-name
id="primary-name"
.strings="${this.strings}"
></grampsjs-form-name>

<h4 class="label">${this._('Gender')}</h4>
<mwc-select id="select-confidence" @change="${this.handleGender}">
${Object.keys(gender).map(
genderConst => html`
<mwc-list-item
value="${genderConst}"
?selected="${
// eslint-disable-next-line eqeqeq
genderConst == this.data.gender
}"
>${this._(gender[genderConst])}</mwc-list-item
>
`
)}
</mwc-select>

<h4 class="label">${this._('Birth Date')}</h4>

<p>
<grampsjs-form-select-date id="birth-date" .strings="${this.strings}">
</grampsjs-form-select-date>
</p>

<h4 class="label">${this._('Birth Place')}</h4>

<grampsjs-form-select-object-list
id="birth-place"
objectType="place"
.strings="${this.strings}"
></grampsjs-form-select-object-list>

<h4 class="label">${this._('Death Date')}</h4>

<p>
<grampsjs-form-select-date id="death-date" .strings="${this.strings}">
</grampsjs-form-select-date>
</p>

<h4 class="label">${this._('Death Place')}</h4>

<grampsjs-form-select-object-list
id="death-place"
objectType="place"
.strings="${this.strings}"
></grampsjs-form-select-object-list>

${this._renderCitationForm()}

<div class="spacer"></div>
<grampsjs-form-private
id="private"
.strings="${this.strings}"
></grampsjs-form-private>
`
}
}
80 changes: 6 additions & 74 deletions src/views/GrampsjsViewNewPerson.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import {html} from 'lit'

import {GrampsjsViewNewObject} from './GrampsjsViewNewObject.js'
import '../components/GrampsjsFormName.js'
import '../components/GrampsjsFormPrivate.js'
import '../components/GrampsjsFormSelectObjectList.js'
import {GrampsjsViewNewObject} from './GrampsjsViewNewObject.js'
import {GrampsjsNewPersonMixin} from '../mixins/GrampsjsNewPersonMixin.js'
import {makeHandle, dateIsEmpty} from '../util.js'
import {apiPost} from '../api.js'

const gender = {
2: 'Unknown',
1: 'Male',
0: 'Female',
}

const dataDefault = {_class: 'Person', gender: 2, citation_list: []}

export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
export class GrampsjsViewNewPerson extends GrampsjsNewPersonMixin(
GrampsjsViewNewObject
) {
constructor() {
super()
this.data = dataDefault
@@ -27,76 +24,11 @@ export class GrampsjsViewNewPerson extends GrampsjsViewNewObject {
renderContent() {
return html`
<h2>${this._('New Person')}</h2>

<h4 class="label">${this._('Name')}</h4>
<grampsjs-form-name
id="primary-name"
.strings="${this.strings}"
></grampsjs-form-name>

<h4 class="label">${this._('Gender')}</h4>
<mwc-select id="select-confidence" @change="${this.handleGender}">
${Object.keys(gender).map(
genderConst => html`
<mwc-list-item
value="${genderConst}"
?selected="${
// eslint-disable-next-line eqeqeq
genderConst == this.data.gender
}"
>${this._(gender[genderConst])}</mwc-list-item
>
`
)}
</mwc-select>

<h4 class="label">${this._('Birth Date')}</h4>

<p>
<grampsjs-form-select-date id="birth-date" .strings="${this.strings}">
</grampsjs-form-select-date>
</p>

<h4 class="label">${this._('Birth Place')}</h4>

<grampsjs-form-select-object-list
id="birth-place"
objectType="place"
.strings="${this.strings}"
></grampsjs-form-select-object-list>

<h4 class="label">${this._('Death Date')}</h4>

<p>
<grampsjs-form-select-date id="death-date" .strings="${this.strings}">
</grampsjs-form-select-date>
</p>

<h4 class="label">${this._('Death Place')}</h4>

<grampsjs-form-select-object-list
id="death-place"
objectType="place"
.strings="${this.strings}"
></grampsjs-form-select-object-list>

${this._renderCitationForm()}

<div class="spacer"></div>
<grampsjs-form-private
id="private"
.strings="${this.strings}"
></grampsjs-form-private>

${this.renderButtons()}
${this.renderForm()} ${this.renderButtons()}
`
// <pre>${JSON.stringify(this.data, null, 2)}</pre>
}

handleGender(e) {
this.data = {...this.data, gender: parseInt(e.target.value, 10)}
}

_handleFormData(e) {
super._handleFormData(e)
const originalTarget = e.composedPath()[0]