From 52071d78916afc1846c8a5311a76f71e6ae94589 Mon Sep 17 00:00:00 2001
From: Kevin Gill <hkevgill@hotmail.com>
Date: Sun, 18 Mar 2018 23:59:45 -0700
Subject: [PATCH 1/5] Issue #326: Add in Draft state to opportunity model and
 set state to Draft on first save

---
 .../client/controllers/opportunities.client.controller.js   | 6 ++++++
 .../opportunities/server/models/opportunity.server.model.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/opportunities/client/controllers/opportunities.client.controller.js b/modules/opportunities/client/controllers/opportunities.client.controller.js
index 2dbe0258a..88cb323e9 100644
--- a/modules/opportunities/client/controllers/opportunities.client.controller.js
+++ b/modules/opportunities/client/controllers/opportunities.client.controller.js
@@ -688,6 +688,12 @@
 				}
 			}
 			//
+			// if status was Pending, set to Draft. happens on first save
+			//
+			if (vm.opportunity.status === 'Pending') {
+				vm.opportunity.status = 'Draft';
+			}
+			//
 			// ensure that there is a trailing '/' on the github field
 			//
 			if (vm.opportunity.github && vm.opportunity.github.substr (-1, 1) !== '/') vm.opportunity.github += '/';
diff --git a/modules/opportunities/server/models/opportunity.server.model.js b/modules/opportunities/server/models/opportunity.server.model.js
index 7ab8efc6e..687904260 100644
--- a/modules/opportunities/server/models/opportunity.server.model.js
+++ b/modules/opportunities/server/models/opportunity.server.model.js
@@ -39,7 +39,7 @@ var OpportunitySchema = new Schema({
 	views                     : {type: Number, default: 1},
 	program                   : {type: Schema.ObjectId, ref: 'Program', default: null, required: 'Program cannot be blank'},
 	project                   : {type: Schema.ObjectId, ref: 'Project', default: null, required: 'Project cannot be blank'},
-	status                    : {type: String, default:'Pending', enum:['Pending', 'Assigned', 'In Progress', 'Completed']},
+	status                    : {type: String, default:'Pending', enum:['Draft', 'Pending', 'Assigned', 'In Progress', 'Completed']},
 	onsite                    : {type: String, default:'mixed', enum:['mixed', 'onsite', 'offsite']},
 	location                  : {type: String, default:''},
 	isPublished               : {type: Boolean, default: false},

From e5d119ecb043f32aa42a5898dac6fe31c468a078 Mon Sep 17 00:00:00 2001
From: Kevin Gill <hkevgill@hotmail.com>
Date: Mon, 19 Mar 2018 01:40:45 -0700
Subject: [PATCH 2/5] Got submit page functioning. with the submit function
 shell

---
 .../config/opportunities.client.routes.js     | 27 +++++++
 .../opportunities.client.controller.js        | 39 +++++++--
 .../client/views/cwu-opportunity-submit.html  | 79 +++++++++++++++++++
 .../client/views/cwu-opportunity-view.html    | 12 +--
 4 files changed, 147 insertions(+), 10 deletions(-)
 create mode 100644 modules/opportunities/client/views/cwu-opportunity-submit.html

diff --git a/modules/opportunities/client/config/opportunities.client.routes.js b/modules/opportunities/client/config/opportunities.client.routes.js
index 308e59e70..a5dc0d409 100644
--- a/modules/opportunities/client/config/opportunities.client.routes.js
+++ b/modules/opportunities/client/config/opportunities.client.routes.js
@@ -224,6 +224,33 @@
 		})
 		// -------------------------------------------------------------------------
 		//
+		// submit an opportunity
+		//
+		// -------------------------------------------------------------------------
+		.state('opportunityadmin.submitcwu', {
+			url: '/:opportunityId/submitcwu',
+			templateUrl: '/modules/opportunities/client/views/cwu-opportunity-submit.html',
+			controller: 'OpportunitySubmitController',
+			controllerAs: 'vm',
+			resolve: {
+				opportunity: function ($stateParams, OpportunitiesService) {
+					return OpportunitiesService.get({
+						opportunityId: $stateParams.opportunityId
+					}).$promise;
+				},
+				submitting: function () { return true; }
+			},
+			data: {
+				roles: ['admin', 'gov'],
+				pageTitle: 'Submit Opportunity: {{ opportunity.name }}'
+			},
+			ncyBreadcrumb: {
+				label: 'Submit Opportunity',
+				parent: 'opportunities.list'
+			}
+		})
+		// -------------------------------------------------------------------------
+		//
 		// edit a opportunity
 		//
 		// -------------------------------------------------------------------------
diff --git a/modules/opportunities/client/controllers/opportunities.client.controller.js b/modules/opportunities/client/controllers/opportunities.client.controller.js
index 88cb323e9..083a77ee7 100644
--- a/modules/opportunities/client/controllers/opportunities.client.controller.js
+++ b/modules/opportunities/client/controllers/opportunities.client.controller.js
@@ -106,7 +106,7 @@
 		//
 		// -------------------------------------------------------------------------
 		vm.errorFields = OpportunitiesCommon.publishStatus (vm.opportunity);
-		vm.canPublish = (vm.errorFields.length === 0);
+		vm.canSubmit = (vm.errorFields.length === 0);
 		// -------------------------------------------------------------------------
 		//
 		// issue a request for membership
@@ -367,14 +367,14 @@
 		// publish or un publish the opportunity
 		//
 		// -------------------------------------------------------------------------
-		vm.publish = function (opportunity, state) {
-			var publishedState      = opportunity.isPublished;
+		vm.submit = function (opportunity, state) {
+			var publishedState = opportunity.isPublished;
 			var t = state ? 'Published' : 'Unpublished';
 
 			var savemeSeymour = true;
 			var promise = Promise.resolve ();
 			if (state) {
-				var question = 'When you publish this opportunity, we\'ll notify all our subscribed users. Are you sure you\'ve got it just the way you want it?';
+				var question = 'When you submit this opportunity, we\'ll notify all our subscribed users. Are you sure you\'ve got it just the way you want it?';
 				promise = ask.yesNo (question).then (function (result) {
 					savemeSeymour = result;
 				});
@@ -514,7 +514,7 @@
 		//
 		// -------------------------------------------------------------------------
 		vm.errorFields = OpportunitiesCommon.publishStatus (vm.opportunity);
-		vm.canPublish = vm.errorFields > 0;
+		vm.canSubmit = vm.errorFields > 0;
 		//
 		// set up the dropdown amounts for code with us earnings
 		//
@@ -768,5 +768,34 @@
 			vm.displayHelp[field] = ! vm.displayHelp[field];
 		};
 	})
+	// =========================================================================
+	//
+	// Controller for the master list of programs
+	//
+	// =========================================================================
+	.controller('OpportunitySubmitController', function ($scope, Authentication, Notification, opportunity, $stateParams) {
+		var vm          = this;
+		vm.opportunity = opportunity;
+		var isUser      = Authentication.user;
+		var isAdmin     = isUser && !!~Authentication.user.roles.indexOf ('admin');
+		var isGov       = isUser && !!~Authentication.user.roles.indexOf ('gov');
+		vm.userCanAdd   = (isAdmin || isGov);
+
+		console.log(vm.opportunity);
+
+		vm.submit = function(isValid) {
+			console.log('CORRECT SUBMIT');
+			console.log(isValid);
+			if (!isValid) {
+				// console.log (vm.opportunityForm);
+				$scope.$broadcast('show-errors-check-validity', 'vm.opportunitySubmitForm');
+				Notification.error ({
+					message : 'There are errors on the page, please review your work and re-save',
+					title   : '<i class=\'glyphicon glyphicon-remove\'></i> Errors on Page'
+				});
+				return false;
+			}
+		};
+	})
 	;
 }());
diff --git a/modules/opportunities/client/views/cwu-opportunity-submit.html b/modules/opportunities/client/views/cwu-opportunity-submit.html
new file mode 100644
index 000000000..3940d670e
--- /dev/null
+++ b/modules/opportunities/client/views/cwu-opportunity-submit.html
@@ -0,0 +1,79 @@
+<section class="edit-form-background" role="main">
+
+    <form id="opportunitySubmitForm" warn-on-exit name="vm.opportunitySubmitForm" class="form" ng-submit="vm.submit(vm.opportunitySubmitForm.$valid)" novalidate>
+
+        <div class="container edit-form">
+
+            <div class="edit-form-tab-content">
+                <fieldset>
+
+                    <form-display
+                        class="col-sm-12"
+                        x-options='{
+                            "title":"Opportunity",
+                            "name":"opportunity",
+                            "help":"This is the opportunity"
+                        }'>
+                        <span>
+                            {{vm.opportunity.name}}
+                        </span>
+                    </form-display>
+
+                    <form-input
+                        class="col-sm-12"
+                        type="email"
+                        ng-model="vm.user.admEmail"
+                        x-form="vm.opportunitySubmitForm"
+                        x-options='{
+                            "title":"ADM&#39;s Email",
+                            "help":"Enter the Assistant Deputy Minister&#39;s email.",
+                            "id":"admEmail",
+                            "name":"admEmail",
+                            "placeholder":"firstName.lastName@gov.bc.ca"
+                        }'>
+                    </form-input>
+
+                    <form-input
+                        class="col-sm-12"
+                        type="email"
+                        ng-model="vm.user.dfsEmail"
+                        x-form="vm.opportunitySubmitForm"
+                        x-options='{
+                            "title":"DFS&#39;s Email",
+                            "help":"Enter the Divisonal Financial Staff&#39;s email.",
+                            "id":"dfsEmail",
+                            "name":"dfsEmail",
+                            "placeholder":"firstName.lastName@gov.bc.ca"
+                        }'>
+                    </form-input>
+
+
+                    <form-input
+                        class="col-sm-12"
+                        type="email"
+                        ng-model="vm.user.bfsEmail"
+                        x-form="vm.opportunitySubmitForm"
+                        x-options='{
+                            "title":"BFS&#39;s Email",
+                            "help":"Enter the Branch Financial Staff&#39;s email.",
+                            "id":"bfsEmail",
+                            "name":"bfsEmail",
+                            "placeholder":"firstName.lastName@gov.bc.ca"
+                        }'>
+                    </form-input>
+                </fieldset>
+            </div>
+
+            <div class="edit-form-footer">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <button type="submit" href="javascript:void(0);" class="btn btn-primary pull-right"><i class="fa fa-save"></i> Submit</button>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+    </form>
+
+</section>
diff --git a/modules/opportunities/client/views/cwu-opportunity-view.html b/modules/opportunities/client/views/cwu-opportunity-view.html
index 3fa8f5bce..0dae2293d 100644
--- a/modules/opportunities/client/views/cwu-opportunity-view.html
+++ b/modules/opportunities/client/views/cwu-opportunity-view.html
@@ -83,11 +83,11 @@ <h4 class="opp-detail" class="card-title" style="font-size: 17px; padding-top: 6
 	</div>
 	
 	<div class="container">	
-		<!-- // Admin View / if opportunity is in DRAFT and INCOMPLETE // -->
-		<div class="row" ng-if="!vm.canPublish && vm.canEdit">
+		<!-- // Admin View / if opportunity is in DRAFT/PENDING and INCOMPLETE // -->
+		<div class="row" ng-if="!vm.canSubmit && vm.canEdit && (vm.opportunity.status === 'Draft' || vm.opportunity.status === 'Pending')">
 			<div class="col-xs-12">
 				<div class="alert alert-important">
-					<span class="strong"><i class="fa fa-exclamation-triangle"></i> Your opportunity is missing stuff!</span> Before you can publish, you'll need to define these things:
+					<span class="strong"><i class="fa fa-exclamation-triangle"></i> Your opportunity is missing stuff!</span> Before you can submit, you'll need to define these things:
 					<ul style="text-align: left;"><li ng-repeat="fname in vm.errorFields">{{fname}}</li></ul>
 				</div>
 			</div>
@@ -95,11 +95,13 @@ <h4 class="opp-detail" class="card-title" style="font-size: 17px; padding-top: 6
 
 
 		<!-- // Admin Controls / if opportunity is in DRAFT and COMPLETE // -->
-		<div class="row" ng-if="vm.canEdit && !vm.opportunity.isPublished">
+		<div class="row" ng-if="vm.canEdit">
 			<div class="col-xs-12">
 				<div class="pull-right" role="group">
 					<button type="button" class="btn btn-sm btn-text-only" ng-if="vm.canEdit" ui-sref="opportunityadmin.editcwu({opportunityId:vm.opportunity.code})"><i class="fa fa-pencil"></i> EDIT</button>
-					<a href="javascript:void(0);" ng-if="vm.canPublish && vm.opportunity.project.isPublished && vm.canEdit && !vm.opportunity.isPublished" class="btn btn-sm btn-primary" ng-click="vm.publish(vm.opportunity, true)"><i class="fa fa-bullhorn"></i> PUBLISH</a>
+
+					<button type="button" class="btn btn-sm btn-primary" ng-if="vm.canSubmit && vm.opportunity.project.isPublished && vm.canEdit && vm.opportunity.status === 'Draft'" ui-sref="opportunityadmin.submitcwu({opportunityId:vm.opportunity.code})"><i class="fa fa-bullhorn"></i> SUBMIT</button>
+
 				</div>
 			</div>
 		</div>

From 666421d57e2a66160f3952845a5ccc91c12b3804 Mon Sep 17 00:00:00 2001
From: Kevin Gill <hkevgill@hotmail.com>
Date: Mon, 19 Mar 2018 02:34:49 -0700
Subject: [PATCH 3/5] User is saving the email fields, opportunity status is
 flipping to Pending on submit. Just need to fill out email template and send

---
 .../controllers/core.server.controller.js     |  7 ++--
 .../opportunity-notification-body.md          |  0
 .../opportunity-notification-subject.md       |  0
 .../services/notifications.client.service.js  |  4 +++
 .../notifications.server.controller.js        |  8 +++++
 .../routes/notifications.server.routes.js     |  2 ++
 .../opportunities.client.controller.js        | 35 +++++++++++++------
 .../client/views/cwu-opportunity-submit.html  |  1 -
 .../users/server/models/user.server.model.js  | 21 +++++++++++
 9 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 modules/core/server/email_templates/opportunity-notification-body.md
 create mode 100644 modules/core/server/email_templates/opportunity-notification-subject.md

diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js
index 50ff96aaf..3aeb2b4e2 100644
--- a/modules/core/server/controllers/core.server.controller.js
+++ b/modules/core/server/controllers/core.server.controller.js
@@ -59,8 +59,11 @@ exports.renderIndex = function (req, res) {
       linkedIn                : req.user.linkedIn,
       isPublicProfile         : req.user.isPublicProfile,
       isAutoAdd               : req.user.isAutoAdd,
-      capabilityDetails : req.user.capabilityDetails,
-      capabilitySkills : req.user.capabilitySkills
+      capabilityDetails       : req.user.capabilityDetails,
+      capabilitySkills        : req.user.capabilitySkills,
+      admEmail                : req.user.admEmail,
+      dfsEmail                : req.user.dfsEmail,
+      bfsEmail                : req.user.bfsEmail
     };
   }
   var features = config.features.split ('-');
diff --git a/modules/core/server/email_templates/opportunity-notification-body.md b/modules/core/server/email_templates/opportunity-notification-body.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/core/server/email_templates/opportunity-notification-subject.md b/modules/core/server/email_templates/opportunity-notification-subject.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/notifications/client/services/notifications.client.service.js b/modules/notifications/client/services/notifications.client.service.js
index 1c61d8ead..ff708d827 100644
--- a/modules/notifications/client/services/notifications.client.service.js
+++ b/modules/notifications/client/services/notifications.client.service.js
@@ -40,6 +40,10 @@
 				url: '/api/my/subscriptions/:subscriptionId',
 				isArray: false
 			},
+			opportunityNotification: {
+				method: 'POST',
+				url: '/api/notification/opportunityNotification'
+			},
 			subscribeNotification: {
 				method: 'GET',
 				url: '/api/my/notification/:notificationId',
diff --git a/modules/notifications/server/controllers/notifications.server.controller.js b/modules/notifications/server/controllers/notifications.server.controller.js
index 367dd1aad..721452115 100644
--- a/modules/notifications/server/controllers/notifications.server.controller.js
+++ b/modules/notifications/server/controllers/notifications.server.controller.js
@@ -792,6 +792,14 @@ exports.checkSubscriptions = function (req, res) {
 		res.status(404).json({ok:false});
 	}
 };
+exports.opportunityNotification = function (req, res) {
+	console.log('MADE IT TO THE SERVER JUST NEED TO SEND EMAIL');
+	console.log(req.body.template);
+	console.log(req.body.recipient);
+	console.log(req.body.opportunityId);
+	res.json(200);
+	//send email here
+};
 exports.countFollowingOpportunity = function (oppcode) {
 	var notcode = 'not-update-'+oppcode;
 	return new Promise (function (resolve, reject) {
diff --git a/modules/notifications/server/routes/notifications.server.routes.js b/modules/notifications/server/routes/notifications.server.routes.js
index f159097a3..29e705c38 100644
--- a/modules/notifications/server/routes/notifications.server.routes.js
+++ b/modules/notifications/server/routes/notifications.server.routes.js
@@ -58,6 +58,8 @@ module.exports = function(app) {
 
 	app.route('/api/cc/tryme').get(notifications.tryme);
 
+	app.route('/api/notification/opportunityNotification').post(notifications.opportunityNotification);
+
 	// Finish by binding the Notification middleware
 	app.param('notificationId', notifications.notificationByID);
 	app.param('subscriptionId', notifications.subscriptionById);
diff --git a/modules/opportunities/client/controllers/opportunities.client.controller.js b/modules/opportunities/client/controllers/opportunities.client.controller.js
index 083a77ee7..978accd4a 100644
--- a/modules/opportunities/client/controllers/opportunities.client.controller.js
+++ b/modules/opportunities/client/controllers/opportunities.client.controller.js
@@ -773,19 +773,12 @@
 	// Controller for the master list of programs
 	//
 	// =========================================================================
-	.controller('OpportunitySubmitController', function ($scope, Authentication, Notification, opportunity, $stateParams) {
+	.controller('OpportunitySubmitController', function ($scope, $state, Authentication, NotificationsService, UsersService, Notification, opportunity, $stateParams) {
 		var vm          = this;
-		vm.opportunity = opportunity;
-		var isUser      = Authentication.user;
-		var isAdmin     = isUser && !!~Authentication.user.roles.indexOf ('admin');
-		var isGov       = isUser && !!~Authentication.user.roles.indexOf ('gov');
-		vm.userCanAdd   = (isAdmin || isGov);
-
-		console.log(vm.opportunity);
+		vm.opportunity 	= opportunity;
+		vm.user  		= Authentication.user;
 
 		vm.submit = function(isValid) {
-			console.log('CORRECT SUBMIT');
-			console.log(isValid);
 			if (!isValid) {
 				// console.log (vm.opportunityForm);
 				$scope.$broadcast('show-errors-check-validity', 'vm.opportunitySubmitForm');
@@ -795,6 +788,28 @@
 				});
 				return false;
 			}
+
+			// Set opportunity status to Pending
+			// vm.opportunity.status = 'Pending';
+			var opportunityPromise = vm.opportunity.createOrUpdate();
+
+			// Save email addresses to user profile, ng-model sets them
+			var userPromise = UsersService.update(user).$promise;
+
+			// Send email to ADM
+			var body = {
+				recipient: vm.user.admEmail,
+				opportunityId: vm.opportunity.code,
+				template: 'opportunity-notification',
+			};
+			var admNotificationPromise = NotificationsService.opportunityNotification(body).$promise;
+
+			// Resolve all promises
+			Promise.all([opportunityPromise, userPromise, admNotificationPromise]).then(function() {
+				// success and redirect
+				$state.go('opportunities.viewcwu', {opportunityId:vm.opportunity.code});
+			});
+
 		};
 	})
 	;
diff --git a/modules/opportunities/client/views/cwu-opportunity-submit.html b/modules/opportunities/client/views/cwu-opportunity-submit.html
index 3940d670e..47a5e5827 100644
--- a/modules/opportunities/client/views/cwu-opportunity-submit.html
+++ b/modules/opportunities/client/views/cwu-opportunity-submit.html
@@ -47,7 +47,6 @@
                         }'>
                     </form-input>
 
-
                     <form-input
                         class="col-sm-12"
                         type="email"
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 3bdab6209..0508b12f3 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -90,6 +90,27 @@ var UserSchema = new Schema({
 		lowercase: true,
 		trim: true
 	},
+	admEmail : {
+		type: String,
+		lowercase: true,
+		trim: true,
+		default: '',
+		validate: [validateLocalStrategyEmail, 'Please fill a valid email address']
+	},
+	dfsEmail 				 : {
+		type: String,
+		lowercase: true,
+		trim: true,
+		default: '',
+		validate: [validateLocalStrategyEmail, 'Please fill a valid email address']
+	},
+	bfsEmail 				 : {
+		type: String,
+		lowercase: true,
+		trim: true,
+		default: '',
+		validate: [validateLocalStrategyEmail, 'Please fill a valid email address']
+	},
 	orgsAdmin                : {type:[{type:Schema.ObjectId, ref:'Org'}], default:[]},
 	orgsMember               : {type:[{type:Schema.ObjectId, ref:'Org'}], default:[]},
 	orgsPending              : {type:[{type:Schema.ObjectId, ref:'Org'}], default:[]},

From 2f49fd2a1c3dc3f5dd0b57bc1554d80bf4357aa5 Mon Sep 17 00:00:00 2001
From: Kevin Gill <hkevgill@hotmail.com>
Date: Mon, 19 Mar 2018 03:53:23 -0700
Subject: [PATCH 4/5] Finishing off sending email

---
 .../opportunity-notification-body.md          | 26 ++++++++++++++++++
 .../opportunity-notification-subject.md       |  1 +
 .../services/notifications.client.service.js  |  4 ---
 .../notifications.server.controller.js        |  8 ------
 .../routes/notifications.server.routes.js     |  2 --
 .../opportunities.client.controller.js        | 11 +++++---
 .../services/opportunities.client.service.js  |  4 +++
 .../opportunities.server.controller.js        | 27 +++++++++++++++++++
 .../routes/opportunities.server.routes.js     |  3 ++-
 9 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/modules/core/server/email_templates/opportunity-notification-body.md b/modules/core/server/email_templates/opportunity-notification-body.md
index e69de29bb..4a3898070 100644
--- a/modules/core/server/email_templates/opportunity-notification-body.md
+++ b/modules/core/server/email_templates/opportunity-notification-body.md
@@ -0,0 +1,26 @@
+{{#markdown this}}
+![BC Dev Exchange](https://bcdevexchange.org/modules/core/client/img/logo/new-logo-220px.png)
+
+### Dear {{data.username}},
+
+Opportunity {{data.name}} {{data._id}} was submitted.
+
+---
+
+Details:
+
+*Unique ID: {{data._id}}
+
+*Associated RFP control: {{data.rfp}}
+
+*Posting date: {{data.postingDate}}
+
+*Value of opportunity: High
+
+*Required Skills: {{data.requiredSkills}}
+
+*Closing date: {{data.closingDate}}
+
+### [Agree](some/url/agree)
+### [Disagree](some/url/disagree)
+{{/markdown}}
diff --git a/modules/core/server/email_templates/opportunity-notification-subject.md b/modules/core/server/email_templates/opportunity-notification-subject.md
index e69de29bb..9b9357084 100644
--- a/modules/core/server/email_templates/opportunity-notification-subject.md
+++ b/modules/core/server/email_templates/opportunity-notification-subject.md
@@ -0,0 +1 @@
+Opportunity {{ data.name }} has been submitted.
\ No newline at end of file
diff --git a/modules/notifications/client/services/notifications.client.service.js b/modules/notifications/client/services/notifications.client.service.js
index ff708d827..1c61d8ead 100644
--- a/modules/notifications/client/services/notifications.client.service.js
+++ b/modules/notifications/client/services/notifications.client.service.js
@@ -40,10 +40,6 @@
 				url: '/api/my/subscriptions/:subscriptionId',
 				isArray: false
 			},
-			opportunityNotification: {
-				method: 'POST',
-				url: '/api/notification/opportunityNotification'
-			},
 			subscribeNotification: {
 				method: 'GET',
 				url: '/api/my/notification/:notificationId',
diff --git a/modules/notifications/server/controllers/notifications.server.controller.js b/modules/notifications/server/controllers/notifications.server.controller.js
index 721452115..367dd1aad 100644
--- a/modules/notifications/server/controllers/notifications.server.controller.js
+++ b/modules/notifications/server/controllers/notifications.server.controller.js
@@ -792,14 +792,6 @@ exports.checkSubscriptions = function (req, res) {
 		res.status(404).json({ok:false});
 	}
 };
-exports.opportunityNotification = function (req, res) {
-	console.log('MADE IT TO THE SERVER JUST NEED TO SEND EMAIL');
-	console.log(req.body.template);
-	console.log(req.body.recipient);
-	console.log(req.body.opportunityId);
-	res.json(200);
-	//send email here
-};
 exports.countFollowingOpportunity = function (oppcode) {
 	var notcode = 'not-update-'+oppcode;
 	return new Promise (function (resolve, reject) {
diff --git a/modules/notifications/server/routes/notifications.server.routes.js b/modules/notifications/server/routes/notifications.server.routes.js
index 29e705c38..f159097a3 100644
--- a/modules/notifications/server/routes/notifications.server.routes.js
+++ b/modules/notifications/server/routes/notifications.server.routes.js
@@ -58,8 +58,6 @@ module.exports = function(app) {
 
 	app.route('/api/cc/tryme').get(notifications.tryme);
 
-	app.route('/api/notification/opportunityNotification').post(notifications.opportunityNotification);
-
 	// Finish by binding the Notification middleware
 	app.param('notificationId', notifications.notificationByID);
 	app.param('subscriptionId', notifications.subscriptionById);
diff --git a/modules/opportunities/client/controllers/opportunities.client.controller.js b/modules/opportunities/client/controllers/opportunities.client.controller.js
index 978accd4a..88f729917 100644
--- a/modules/opportunities/client/controllers/opportunities.client.controller.js
+++ b/modules/opportunities/client/controllers/opportunities.client.controller.js
@@ -773,7 +773,7 @@
 	// Controller for the master list of programs
 	//
 	// =========================================================================
-	.controller('OpportunitySubmitController', function ($scope, $state, Authentication, NotificationsService, UsersService, Notification, opportunity, $stateParams) {
+	.controller('OpportunitySubmitController', function ($scope, $state, Authentication, OpportunitiesService, UsersService, Notification, opportunity, $stateParams) {
 		var vm          = this;
 		vm.opportunity 	= opportunity;
 		vm.user  		= Authentication.user;
@@ -789,8 +789,11 @@
 				return false;
 			}
 
+			// TODO could be one API call
+			// might improve performance
+
 			// Set opportunity status to Pending
-			// vm.opportunity.status = 'Pending';
+			vm.opportunity.status = 'Pending';
 			var opportunityPromise = vm.opportunity.createOrUpdate();
 
 			// Save email addresses to user profile, ng-model sets them
@@ -799,10 +802,10 @@
 			// Send email to ADM
 			var body = {
 				recipient: vm.user.admEmail,
-				opportunityId: vm.opportunity.code,
+				opportunityId: vm.opportunity._id,
 				template: 'opportunity-notification',
 			};
-			var admNotificationPromise = NotificationsService.opportunityNotification(body).$promise;
+			var admNotificationPromise = OpportunitiesService.opportunityNotification(body).$promise;
 
 			// Resolve all promises
 			Promise.all([opportunityPromise, userPromise, admNotificationPromise]).then(function() {
diff --git a/modules/opportunities/client/services/opportunities.client.service.js b/modules/opportunities/client/services/opportunities.client.service.js
index d8bdbc6fd..976cb15c8 100644
--- a/modules/opportunities/client/services/opportunities.client.service.js
+++ b/modules/opportunities/client/services/opportunities.client.service.js
@@ -59,6 +59,10 @@
 				url: '/api/my/opportunities',
 				isArray: true
 			},
+			opportunityNotification: {
+				method: 'POST',
+				url: '/api/opportunity/opportunityNotification'
+			},
 			publish: {
 				method: 'GET',
 				url :'/api/opportunities/publish/:opportunityId'
diff --git a/modules/opportunities/server/controllers/opportunities.server.controller.js b/modules/opportunities/server/controllers/opportunities.server.controller.js
index 20cd8d247..140a3bceb 100644
--- a/modules/opportunities/server/controllers/opportunities.server.controller.js
+++ b/modules/opportunities/server/controllers/opportunities.server.controller.js
@@ -363,6 +363,33 @@ exports.create = function(req, res) {
 	});
 };
 
+// -------------------------------------------------------------------------
+//
+// Sends email to ADM when opportunity is submitted
+//
+// -------------------------------------------------------------------------
+exports.opportunityNotification = function (req, res) {
+	console.log(req.body.opportunityId);
+	Opportunity.findById (req.body.opportunityId)
+		.exec (function (err, opportunity) {
+			var data = setNotificationData (opportunity);
+			data.username = '';
+			data.useremail = req.body.recipient;
+			data._id = opportunity._id;
+			data.name = opportunity.name;
+			data.rfp = opportunity.proposal;
+			data.postingDate = data.dateStart;
+			data.requiredSkills = opportunity.skills.join(', ');
+			data.closingDate = opportunity.dateDeadline
+			Notifications.notifyUserAdHoc(req.body.template, data);
+			res.status(200);
+		});
+
+	//TODO better error handling
+
+	res.status(500);
+};
+
 // -------------------------------------------------------------------------
 //
 // this just takes the already queried object and pass it back
diff --git a/modules/opportunities/server/routes/opportunities.server.routes.js b/modules/opportunities/server/routes/opportunities.server.routes.js
index 54b0cadbb..b49ee817c 100644
--- a/modules/opportunities/server/routes/opportunities.server.routes.js
+++ b/modules/opportunities/server/routes/opportunities.server.routes.js
@@ -21,6 +21,8 @@ module.exports = function(app) {
 	app.route('/api/my/opportunities').all(opportunitiesPolicy.isAllowed)
 		.get(opportunities.my);
 
+	app.route('/api/opportunity/opportunityNotification').post(opportunities.opportunityNotification);
+
 	//
 	// opportunities for project
 	//
@@ -64,7 +66,6 @@ module.exports = function(app) {
 	app.route('/api/request/opportunity/:opportunityId')
 		.get(opportunities.request)
 
-
 	// Finish by binding the Opportunity middleware
 	app.param('opportunityId', opportunities.opportunityByID);
 };

From dd7e3ff6cffb85f5888dd21b395041545c08858e Mon Sep 17 00:00:00 2001
From: Kevin Gill <hkevgill@hotmail.com>
Date: Mon, 19 Mar 2018 03:58:36 -0700
Subject: [PATCH 5/5] Fixing comments

---
 .../client/controllers/opportunities.client.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/opportunities/client/controllers/opportunities.client.controller.js b/modules/opportunities/client/controllers/opportunities.client.controller.js
index 88f729917..e5392fa01 100644
--- a/modules/opportunities/client/controllers/opportunities.client.controller.js
+++ b/modules/opportunities/client/controllers/opportunities.client.controller.js
@@ -770,7 +770,7 @@
 	})
 	// =========================================================================
 	//
-	// Controller for the master list of programs
+	// Controller for submitting opportunities
 	//
 	// =========================================================================
 	.controller('OpportunitySubmitController', function ($scope, $state, Authentication, OpportunitiesService, UsersService, Notification, opportunity, $stateParams) {