|
@@ -2,6 +2,7 @@ define [
|
|
|
"base"
|
|
"base"
|
|
|
], (App) ->
|
|
], (App) ->
|
|
|
App.controller "UserAffiliationsController", ["$scope", "UserAffiliationsDataService", "$q", ($scope, UserAffiliationsDataService, $q) ->
|
|
App.controller "UserAffiliationsController", ["$scope", "UserAffiliationsDataService", "$q", ($scope, UserAffiliationsDataService, $q) ->
|
|
|
|
|
+ $scope.userEmails = []
|
|
|
$scope.countries = []
|
|
$scope.countries = []
|
|
|
$scope.universities = []
|
|
$scope.universities = []
|
|
|
$scope.newAffiliation =
|
|
$scope.newAffiliation =
|
|
@@ -24,8 +25,6 @@ define [
|
|
|
else
|
|
else
|
|
|
{ local: null, domain: null }
|
|
{ local: null, domain: null }
|
|
|
|
|
|
|
|
- UserAffiliationsDataService.getUserEmails()
|
|
|
|
|
-
|
|
|
|
|
$scope.addUniversityToSelection = (universityName) ->
|
|
$scope.addUniversityToSelection = (universityName) ->
|
|
|
{ name: universityName, isUserSuggested: true }
|
|
{ name: universityName, isUserSuggested: true }
|
|
|
|
|
|
|
@@ -66,23 +65,34 @@ define [
|
|
|
|
|
|
|
|
$scope.handleAffiliationFormSubmit = () ->
|
|
$scope.handleAffiliationFormSubmit = () ->
|
|
|
if !$scope.newAffiliation.university?
|
|
if !$scope.newAffiliation.university?
|
|
|
- UserAffiliationsDataService.addUserEmail $scope.newAffiliation.email
|
|
|
|
|
|
|
+ addEmailPromise = UserAffiliationsDataService
|
|
|
|
|
+ .addUserEmail $scope.newAffiliation.email
|
|
|
else
|
|
else
|
|
|
if $scope.newAffiliation.university.isUserSuggested
|
|
if $scope.newAffiliation.university.isUserSuggested
|
|
|
- UserAffiliationsDataService.addUserAffiliationWithUnknownUniversity(
|
|
|
|
|
- $scope.newAffiliation.email,
|
|
|
|
|
- $scope.newAffiliation.university.name,
|
|
|
|
|
- $scope.newAffiliation.country.code,
|
|
|
|
|
- $scope.newAffiliation.role,
|
|
|
|
|
- $scope.newAffiliation.department
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ addEmailPromise = UserAffiliationsDataService
|
|
|
|
|
+ .addUserAffiliationWithUnknownUniversity(
|
|
|
|
|
+ $scope.newAffiliation.email,
|
|
|
|
|
+ $scope.newAffiliation.university.name,
|
|
|
|
|
+ $scope.newAffiliation.country.code,
|
|
|
|
|
+ $scope.newAffiliation.role,
|
|
|
|
|
+ $scope.newAffiliation.department
|
|
|
|
|
+ )
|
|
|
else
|
|
else
|
|
|
- UserAffiliationsDataService.addUserAffiliation(
|
|
|
|
|
- $scope.newAffiliation.email,
|
|
|
|
|
- $scope.newAffiliation.university.id
|
|
|
|
|
- $scope.newAffiliation.role,
|
|
|
|
|
- $scope.newAffiliation.department
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ addEmailPromise = UserAffiliationsDataService
|
|
|
|
|
+ .addUserAffiliation(
|
|
|
|
|
+ $scope.newAffiliation.email,
|
|
|
|
|
+ $scope.newAffiliation.university.id
|
|
|
|
|
+ $scope.newAffiliation.role,
|
|
|
|
|
+ $scope.newAffiliation.department
|
|
|
|
|
+ )
|
|
|
|
|
+ addEmailPromise.then () -> getUserEmails()
|
|
|
|
|
+
|
|
|
|
|
+ # Populates the emails table
|
|
|
|
|
+ getUserEmails = () ->
|
|
|
|
|
+ UserAffiliationsDataService
|
|
|
|
|
+ .getUserEmails()
|
|
|
|
|
+ .then (emails) -> $scope.userEmails = emails
|
|
|
|
|
+ getUserEmails()
|
|
|
|
|
|
|
|
# Populates the countries dropdown
|
|
# Populates the countries dropdown
|
|
|
UserAffiliationsDataService
|
|
UserAffiliationsDataService
|