BA-1131- Implement design changes to CWU proposal

modules/opportunities/client/views/cwu-opportunity-view.html

@@ -129,9 +129,9 @@
     </div>
 
     <!-- // Proposal Application Directive // -->
-    <div class="row" ng-if="!vm.isClosed()">
+    <div class="row">
       <div class="col">
-        <proposal-apply opportunity="vm.opportunity" proposal="vm.myproposal"></proposal-apply>
+        <proposal-apply opportunity="vm.opportunity" isclosed="vm.isClosed()" proposal="vm.myproposal"></proposal-apply>
       </div>
 
     </div>
@@ -318,13 +318,6 @@ <h4>Got Questions?</h4>
         <h3 class="opp-detail">Proposal Evaluation Criteria</h3>
         <p>Your Proposal will be scored by this criteria:</p>
         <p ng-bind-html="vm.opportunity.evaluation"></p>
-
-        <!-- // Proposal Application Directive // -->
-        <div class="row" ng-if="!vm.isClosed()">
-          <div class="col">
-            <proposal-apply opportunity="vm.opportunity" proposal="vm.myproposal"></proposal-apply>
-          </div>
-        </div>
       </div>
     </div>
   </div>

modules/proposals/client/controllers/ProposalEditCWUController.ts

@@ -1,23 +1,22 @@
 'use strict';
 
 import { StateService } from '@uirouter/core';
-import angular, { angularFileUpload, IFormController, IRootScopeService, uiNotification } from 'angular';
+import angular, { angularFileUpload, IFormController, IRootScopeService, ui, uiNotification } from 'angular';
 import moment from 'moment-timezone';
 import { Settings } from 'tinymce';
 import { IOpportunitiesService, IOpportunityResource } from '../../../opportunities/client/services/OpportunitiesService';
 import { IOrgResource } from '../../../orgs/client/services/OrgService';
 import { IAuthenticationService } from '../../../users/client/services/AuthenticationService';
 import { IUserService } from '../../../users/client/services/UsersService';
 import { IUser } from '../../../users/shared/IUserDTO';
+import { ProposalModalActions } from '../directives/ProposalApplyDirective';
 import { IProposalResource, IProposalService } from '../services/ProposalService';
 
 export default class ProposalEditCWUController {
 	public static $inject = [
-		'editing',
 		'$scope',
 		'ask',
 		'Upload',
-		'$state',
 		'proposal',
 		'opportunity',
 		'AuthenticationService',
@@ -26,21 +25,22 @@ export default class ProposalEditCWUController {
 		'UsersService',
 		'Notification',
 		'org',
-		'TinyMceConfiguration'
+		'TinyMceConfiguration',
+		'$uibModalInstance'
 	];
 
 	public members: any[];
 	public title: string;
 	public proposalForm: IFormController;
 
 	private user: IUser;
+	private isclosed: boolean;
+	private hasAttachments: boolean;
 
 	constructor(
-		public editing: boolean,
 		private $scope: IRootScopeService,
 		private ask,
 		private Upload: angularFileUpload.IUploadService,
-		private $state: StateService,
 		public proposal: IProposalResource,
 		public opportunity: IOpportunityResource,
 		private AuthenticationService: IAuthenticationService,
@@ -49,17 +49,20 @@ export default class ProposalEditCWUController {
 		private UsersService: IUserService,
 		private Notification: uiNotification.INotificationService,
 		public org: IOrgResource,
-		public TinyMceConfiguration: Settings
+		public TinyMceConfiguration: Settings,
+		private $uibModalInstance: ui.bootstrap.IModalServiceInstance
 	) {
-		// if not editing (i.e. creating), ensure that the current user doesn't already have a proposal started for this opp
-		// if they do, transition to edit view for that proposal
-		this.checkForExisting();
-
 		// refresh the view based on passed in proposal
 		this.refreshProposal(this.proposal);
 
 		// set the user
 		this.user = this.AuthenticationService.user;
+
+		this.init();
+	}
+
+	private async init(){
+		this.isclosed = await this.isClosed();
 	}
 
 	// Format dates to always be in PST (America/Vancouver timezone)
@@ -92,31 +95,39 @@ export default class ProposalEditCWUController {
 
 			// Save the proposal
 			this.copyUserInfo();
-			let updatedProposal: IProposalResource;
-			if (this.editing) {
-				updatedProposal = await this.ProposalService.update(this.proposal).$promise;
-			} else {
-				updatedProposal = await this.ProposalService.create(this.proposal).$promise;
+			if (this.proposal.status === 'New') {
+				this.proposal.status = 'Draft';
 			}
+			const updatedProposal = await this.ProposalService.update(this.proposal).$promise;
 
-			this.refreshProposal(updatedProposal);
 			this.Notification.success({
 				message: `<i class="fas fa-check-circle"></i> ${successMessage}`
 			});
-			this.proposalForm.$setPristine();
 
-			// if this is a newly created proposal, transition to edit view
-			if (!this.editing) {
-				this.$state.go('proposaladmin.editcwu', { proposalId: this.proposal._id, opportunityId: this.opportunity.code });
-			}
+			// close the modal and include the proposal in the response
+			this.$uibModalInstance.close({
+				action: ProposalModalActions.SAVED,
+				proposal: updatedProposal
+			});
 		} catch (error) {
 			this.handleError(error);
 		}
 	}
 
-	// Leave the edit view
-	public close(): void {
-		this.$state.go('opportunities.viewcwu', { opportunityId: this.opportunity.code });
+	// Leave the edit view and save any changes made if needed
+	public async close(): Promise<void> {
+
+		// If looking at a proposal for a closed opportunity, simply close the modal
+		if(this.isclosed) {
+			this.$uibModalInstance.close({
+				action: ProposalModalActions.SAVED,
+				proposal: this.proposal
+			});
+
+		// If looking at a proposal for an open opportunity, save any changes made
+		} else {
+			this.save(true);
+		}
 	}
 
 	// Delete a proposal
@@ -128,10 +139,12 @@ export default class ProposalEditCWUController {
 				try {
 					await this.proposal.$remove();
 					this.proposalForm.$setPristine();
-					this.$state.go('opportunities.viewcwu', { opportunityId: this.opportunity.code });
 					this.Notification.success({
 						message: '<i class="fas fa-check-circle"></i> Proposal Deleted'
 					});
+					this.$uibModalInstance.close({
+						action: ProposalModalActions.DELETED
+					});
 				} catch (error) {
 					this.handleError(error);
 				}
@@ -162,11 +175,15 @@ export default class ProposalEditCWUController {
 			// Submit the proposal
 			this.copyUserInfo();
 
-			await this.ProposalService.submit(this.proposal).$promise;
+			const submittedProposal = await this.ProposalService.submit(this.proposal).$promise;
 			this.Notification.success({
 				message: '<i class="fas fa-check-circle"></i> Your proposal has been submitted'
 			});
-			this.close();
+
+			this.$uibModalInstance.close({
+				action: ProposalModalActions.SAVED,
+				proposal: submittedProposal
+			});
 		} catch (error) {
 			this.handleError(error);
 		}
@@ -202,7 +219,7 @@ export default class ProposalEditCWUController {
 					message: '<i class="fas fa-check-circle"></i> Attachment Uploaded'
 				});
 
-				const updatedProposal = response.data as IProposalResource;
+				const updatedProposal = new this.ProposalService(response.data);
 				this.refreshProposal(updatedProposal);
 			} catch (error) {
 				this.handleError(error);
@@ -249,6 +266,24 @@ export default class ProposalEditCWUController {
 		}
 	}
 
+	// Set the terms to accepted and update the proposal
+	public async acceptTerms(): Promise<void>{
+		try{
+			this.proposal.isAcceptedTerms = true;
+			const updatedProposal = await this.ProposalService.update(this.proposal).$promise;
+			this.refreshProposal(updatedProposal);
+		}catch(error){
+			this.handleError(error);
+		}
+	}
+
+	// Determine whether the deadline for the opportunity has passed
+	public async isClosed(){
+		const response = await this.OpportunitiesService.getDeadlineStatus({ opportunityId: this.opportunity._id }).$promise;
+		return response.deadlineStatus === 'CLOSED'; 
+	}
+
+	// Determine whether the deadline for the opportunity has passed and send an error if it has
 	private async checkDeadline(): Promise<boolean> {
 		// Check with server to ensure deadline hasn't passed
 		const response = await this.OpportunitiesService.getDeadlineStatus({ opportunityId: this.opportunity._id }).$promise;
@@ -263,16 +298,6 @@ export default class ProposalEditCWUController {
 		}
 	}
 
-	private async checkForExisting(): Promise<void> {
-		if (!this.editing) {
-			const myProposal = await this.ProposalService.getMyProposal({ opportunityId: this.opportunity.code }).$promise;
-
-			if (myProposal && myProposal._id) {
-				this.$state.go('proposaladmin.editcwu', { proposalId: myProposal._id, opportunityId: this.opportunity.code });
-			}
-		}
-	}
-
 	private refreshProposal(newProposal: IProposalResource): void {
 		this.proposal = newProposal;
 
@@ -282,15 +307,12 @@ export default class ProposalEditCWUController {
 			this.members = this.org.members.concat(this.org.admins);
 		}
 
-		this.title = this.editing ? 'Edit' : 'Create';
+		this.title = 'Edit';
 		if (!this.proposal.team) {
 			this.proposal.team = [];
 		}
 
-		// ensure status set accordingly
-		if (!this.editing) {
-			this.proposal.status = 'New';
-		}
+		this.hasAttachments = this.proposal.attachments.length>0;
 	}
 
 	// Copy over user and org information to the proposal