diff --git a/client/app/components/packages/projects/new.hbs b/client/app/components/projects/new.hbs similarity index 93% rename from client/app/components/packages/projects/new.hbs rename to client/app/components/projects/new.hbs index 7d9a10c9..b3c0a282 100644 --- a/client/app/components/packages/projects/new.hbs +++ b/client/app/components/projects/new.hbs @@ -20,7 +20,8 @@ Planning will contact you with the next steps.

- -
@@ -37,7 +38,7 @@
Confirm New Project Submission

diff --git a/client/app/components/packages/projects/new.js b/client/app/components/projects/new.js similarity index 67% rename from client/app/components/packages/projects/new.js rename to client/app/components/projects/new.js index 53e3018d..5929a72d 100644 --- a/client/app/components/packages/projects/new.js +++ b/client/app/components/projects/new.js @@ -1,12 +1,10 @@ +/* eslint-disable no-console */ import Component from '@glimmer/component'; import { action } from '@ember/object'; -import { tracked } from '@glimmer/tracking'; import { inject as service } from '@ember/service'; -import fetch from 'fetch'; -import SubmittableProjectsNewForm from '../../../validations/submittable-projects-new-form'; -import { optionset } from '../../../helpers/optionset'; -import config from '../../../config/environment'; - +import SubmittableProjectsNewForm from '../../validations/submittable-projects-new-form'; +import { optionset } from '../../helpers/optionset'; +import config from '../../config/environment'; export default class ProjectsNewFormComponent extends Component { validations = { @@ -19,12 +17,6 @@ export default class ProjectsNewFormComponent extends Component { @service store; - @tracked - selectedBorough = null; - - @tracked - selectedApplicantType = null; - get boroughOptions() { return optionset(['project', 'boroughs', 'list']); } @@ -34,35 +26,12 @@ export default class ProjectsNewFormComponent extends Component { } @action - handleBoroughChange(selectedBorough) { - console.log('Selected borough:', selectedBorough); - - this.selectedBorough = selectedBorough; - - if (this.args.form) { - this.args.form.set('borough', selectedBorough); - } - } - - @action - handleApplicantTypeChange(selectedApplicantType) { - console.log('Selected Applicant Type:', selectedApplicantType); - - this.selectedApplicantType = selectedApplicantType; - - if (this.args.form) { - this.args.form.set('dcpApplicantType', selectedApplicantType); - } - } - - @action - async submitPackage() { + async submitProject() { const primaryContactInput = { first: this.args.package.primaryContactFirstName, last: this.args.package.primaryContactLastName, email: this.args.package.primaryContactEmail, phone: this.args.package.primaryContactPhone, - role: 'contact', }; const applicantInput = { @@ -70,15 +39,16 @@ export default class ProjectsNewFormComponent extends Component { last: this.args.package.applicantLastName, email: this.args.package.applicantEmail, phone: this.args.package.applicantPhone, - role: 'applicant', }; const contactInputs = [primaryContactInput, applicantInput]; + try { - const contactPromises = contactInputs.map((contact) => this.store.queryRecord('contact', { - email: contact.email, - includeAllStatusCodes: true, - })); + const contactPromises = contactInputs.map((contact) => this.store.queryRecord('contact', + { + email: contact.email, + includeAllStatusCodes: true, + })); const contacts = await Promise.all(contactPromises); @@ -95,6 +65,7 @@ export default class ProjectsNewFormComponent extends Component { } return contact; }); + const [verifiedPrimaryContact, verifiedApplicant] = await Promise.all(verifiedContactPromises); const authSessionRaw = localStorage.getItem('ember_simple_auth-session'); @@ -119,18 +90,18 @@ export default class ProjectsNewFormComponent extends Component { data: { attributes: { dcpProjectname: this.args.package.projectName, - dcpBorough: this.selectedBorough.code, - dcpApplicanttype: this.selectedApplicantType.code, + dcpBorough: this.args.package.borough.code, + dcpApplicanttype: this.args.package.applicantType.code, dcpProjectbrief: '', _dcpApplicantadministratorCustomerValue: verifiedPrimaryContact.id, _dcpApplicantCustomerValue: verifiedApplicant.id, - _dcpLeadplannerValue: verifiedApplicant.id, }, }, }), }); - } catch (e) { - console.log('Save new project package error', e); + } catch (error) { + console.log('Save new project package error', error.message); + console.log('the error', error); } } } diff --git a/client/app/components/packages/projects/projects-new-add-contacts.hbs b/client/app/components/projects/projects-new-add-contacts.hbs similarity index 91% rename from client/app/components/packages/projects/projects-new-add-contacts.hbs rename to client/app/components/projects/projects-new-add-contacts.hbs index 15e101b4..2e7dadb9 100644 --- a/client/app/components/packages/projects/projects-new-add-contacts.hbs +++ b/client/app/components/projects/projects-new-add-contacts.hbs @@ -60,6 +60,11 @@

Applicant

The owner, entity, or representative of the project described in this application.

+

+ If using a company or organization, please split the name in the "First Name" and "Last Name" fields. For example, + "NYC + Planning" would be: First Name: NYC, Last Name: Planning +

First Name @@ -116,4 +121,4 @@ /> -{{/let}} \ No newline at end of file +{{/let}} diff --git a/client/app/components/packages/projects/projects-new-information.hbs b/client/app/components/projects/projects-new-information.hbs similarity index 52% rename from client/app/components/packages/projects/projects-new-information.hbs rename to client/app/components/projects/projects-new-information.hbs index 9d3076cb..4f5f0b6e 100644 --- a/client/app/components/packages/projects/projects-new-information.hbs +++ b/client/app/components/projects/projects-new-information.hbs @@ -4,7 +4,6 @@ Project Name - Borough - - {{borough.label}} + + {{borough.label}} + {{#if form.errors.borough}} + {{#each form.errors.borough.validation as |message|}} +
{{message}}
+ {{/each}} + {{/if}} @@ -39,15 +43,22 @@

{{dcpApplicantType.label}} + {{#if form.errors.applicantType}} + {{#each form.errors.applicantType.validation as |message|}} +
{{message}} +
+ {{/each}} + {{/if}} {{/let}} + diff --git a/client/app/models/project.js b/client/app/models/project.js index dcf7ae07..eb88305d 100644 --- a/client/app/models/project.js +++ b/client/app/models/project.js @@ -3,7 +3,7 @@ import { optionset } from '../helpers/optionset'; export default class ProjectModel extends Model { // The human-readable, descriptive name. - // e.g. "Marcus Garvey Blvd Project" + // e.g. 'Marcus Garvey Blvd Project' @attr dcpProjectname; // The CRM Project 5-letter ID. @@ -68,6 +68,37 @@ export default class ProjectModel extends Model { @attr('number') dcpNewcommunityfacilitysqft; + // new project attributes + + // either 'Other Public entity' or 'Private' + // either 717170000 or 717170002 + @attr('string') + dcpApplicanttype; + + @attr('string') + primaryContactFirstName; + + @attr('string') + primaryContactLastName; + + @attr('string') + primaryContactEmail; + + @attr('string') + primaryContactPhone; + + @attr('string') + applicantFirstName; + + @attr('string') + applicantLastName; + + @attr('string') + applicantEmail; + + @attr('string') + applicantPhone; + // We assume there's only one. If there's >1 in crm, the backend // should return the first one. @belongsTo('artifact', { async: false }) @@ -85,18 +116,22 @@ export default class ProjectModel extends Model { @hasMany('milestone', { async: false }) milestones; - get isDirty () { + get isDirty() { return this.hasDirtyAttributes || (this.artifact && this.artifact.isDirty); } get publicStatusGeneralPublicProject() { - const isGeneralPublic = this.dcpVisibility === optionset(['project', 'dcpVisibility', 'code', 'GENERAL_PUBLIC']); + const isGeneralPublic = this.dcpVisibility + === optionset(['project', 'dcpVisibility', 'code', 'GENERAL_PUBLIC']); return this.dcpPublicstatus && isGeneralPublic; } get pasPackages() { const pasPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'PAS_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'PAS_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -105,7 +140,10 @@ export default class ProjectModel extends Model { get rwcdsPackages() { const rwcdsPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'RWCDS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'RWCDS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -124,7 +162,10 @@ export default class ProjectModel extends Model { get draftLandusePackages() { const landusePackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_LU_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_LU_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -133,7 +174,10 @@ export default class ProjectModel extends Model { get filedLandusePackages() { const landusePackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'FILED_LU_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'FILED_LU_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -142,23 +186,26 @@ export default class ProjectModel extends Model { get postCertLUPackages() { return this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'POST_CERT_LU'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'POST_CERT_LU']), + ) .sortBy('dcpPackageversion') .reverse(); } get easPackages() { - const easPackages = [ - ...this.filedEasPackages, - ...this.draftEasPackages, - ]; + const easPackages = [...this.filedEasPackages, ...this.draftEasPackages]; return easPackages; } get draftEasPackages() { const easPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_EAS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_EAS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -167,7 +214,10 @@ export default class ProjectModel extends Model { get filedEasPackages() { const easPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'FILED_EAS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'FILED_EAS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -176,7 +226,15 @@ export default class ProjectModel extends Model { get scopeOfWorkDraftPackages() { const scopeOfWorkDraftPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_SCOPE_OF_WORK'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset([ + 'package', + 'dcpPackagetype', + 'code', + 'DRAFT_SCOPE_OF_WORK', + ]), + ) .sortBy('dcpPackageversion') .reverse(); @@ -184,19 +242,17 @@ export default class ProjectModel extends Model { } get eisPackages() { - const eisPackages = [ - ...this.feisPackages, - ...this.deisPackages, - ]; + const eisPackages = [...this.feisPackages, ...this.deisPackages]; return eisPackages; } get deisPackages() { const eisPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'PDEIS'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'PDEIS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -205,9 +261,10 @@ export default class ProjectModel extends Model { get feisPackages() { const eisPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'EIS'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'EIS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -216,9 +273,10 @@ export default class ProjectModel extends Model { get technicalMemoPackages() { const technicalMemoPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'TECHNICAL_MEMO'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'TECHNICAL_MEMO']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -227,9 +285,10 @@ export default class ProjectModel extends Model { get workingPackages() { return this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'WORKING_PACKAGE'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'WORKING_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); } diff --git a/client/app/routes/projects/new.js b/client/app/routes/projects/new.js index d2673806..98fd5baf 100644 --- a/client/app/routes/projects/new.js +++ b/client/app/routes/projects/new.js @@ -6,8 +6,12 @@ export default class ProjectsNewRoute extends Route.extend(AuthenticatedRouteMix @service store; async model() { + // console.log(`store`, this.store); + // console.log(`model`, this.model); return { projectName: '', + borough: '', + applicantType: '', primaryContactFirstName: '', primaryContactLastName: '', primaryContactEmail: '', diff --git a/client/app/serializers/project.js b/client/app/serializers/project.js new file mode 100644 index 00000000..4029d33b --- /dev/null +++ b/client/app/serializers/project.js @@ -0,0 +1,8 @@ +import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest'; +import JSONAPISerializer from '@ember-data/serializer/json-api'; + +export default JSONAPISerializer.extend(EmbeddedRecordsMixin, { + attrs: { + projectApplicants: { embedded: 'always' }, + }, +}); diff --git a/client/app/templates/projects/new.hbs b/client/app/templates/projects/new.hbs index 36675f77..47160455 100644 --- a/client/app/templates/projects/new.hbs +++ b/client/app/templates/projects/new.hbs @@ -3,7 +3,7 @@ - diff --git a/client/app/validations/submittable-projects-new-form.js b/client/app/validations/submittable-projects-new-form.js index a532a024..f52b9661 100644 --- a/client/app/validations/submittable-projects-new-form.js +++ b/client/app/validations/submittable-projects-new-form.js @@ -114,4 +114,16 @@ export default { message: 'This field is required', }), ], + borough: [ + validatePresence({ + presence: true, + message: 'Please select a Borough', + }), + ], + applicantType: [ + validatePresence({ + presence: true, + message: 'Please select an Applicant Type', + }), + ], }; diff --git a/server/src/projects/projects.controller.ts b/server/src/projects/projects.controller.ts index 10519fa4..95aab175 100644 --- a/server/src/projects/projects.controller.ts +++ b/server/src/projects/projects.controller.ts @@ -143,14 +143,15 @@ export class ProjectsController { ); } - const newProject = await this.crmService.create('dcp_projects', { - dcp_projectname: allowedAttrs['dcp_projectname'], - dcp_borough: allowedAttrs['dcp_borough'], - dcp_applicanttype: allowedAttrs['dcp_applicanttype'], - 'dcp_applicant_customer_contact@odata.bind': `/contacts(${allowedAttrs['_dcp_applicant_customer_value']})`, - 'dcp_applicantadministrator_customer_contact@odata.bind': `/contacts(${allowedAttrs['_dcp_applicantadministrator_customer_value']})`, - }); - return newProject; + return allowedAttrs; + // const newProject = await this.crmService.create('dcp_projects', { + // dcp_projectname: allowedAttrs['dcp_projectname'], + // dcp_borough: allowedAttrs['dcp_borough'], + // dcp_applicanttype: allowedAttrs['dcp_applicanttype'], + // 'dcp_applicant_customer_contact@odata.bind': `/contacts(${allowedAttrs['_dcp_applicant_customer_value']})`, + // 'dcp_applicantadministrator_customer_contact@odata.bind': `/contacts(${allowedAttrs['_dcp_applicantadministrator_customer_value']})`, + // }); + // return newProject; } @Get('/:id')