UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Platform One
P
Party Bus
Launchboard
launchboard-fe
Commits
a4ffaa72
Commit
a4ffaa72
authored
Feb 24, 2021
by
hunter.congress
Browse files
updated adding users
parent
8b60c3ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
22 deletions
+46
-22
package-lock.json
package-lock.json
+25
-3
src/api/services/team.js
src/api/services/team.js
+5
-6
src/views/Team.vue
src/views/Team.vue
+16
-13
No files found.
package-lock.json
View file @
a4ffaa72
...
@@ -176,6 +176,12 @@
...
@@ -176,6 +176,12 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
"dev": true
},
},
"semver": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
"integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
"dev": true
},
"source-map": {
"source-map": {
"version": "0.5.7",
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
...
@@ -558,7 +564,18 @@
...
@@ -558,7 +564,18 @@
"lodash": {
"lodash": {
"version": "4.17.21",
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
"dev": true
}
}
}
}
...
@@ -1575,8 +1592,7 @@
...
@@ -1575,8 +1592,7 @@
"lodash": {
"lodash": {
"version": "4.17.21",
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
"dev": true
},
},
"source-map": {
"source-map": {
"version": "0.5.7",
"version": "0.5.7",
...
@@ -13041,6 +13057,12 @@
...
@@ -13041,6 +13057,12 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
},
"lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
"dev": true
},
"lodash.defaultsdeep": {
"lodash.defaultsdeep": {
"version": "4.6.1",
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
...
...
src/api/services/team.js
View file @
a4ffaa72
...
@@ -26,8 +26,10 @@ export default {
...
@@ -26,8 +26,10 @@ export default {
async
updateTeam
(
team
,
addPOC
,
editedMembers
)
{
async
updateTeam
(
team
,
addPOC
,
editedMembers
)
{
console
.
log
(
"
UPDATING
"
,
team
,
addPOC
,
editedMembers
);
console
.
log
(
"
UPDATING
"
,
team
,
addPOC
,
editedMembers
);
await
HTTP
.
put
(
`/teams/
${
team
.
id
}
/members`
,
editedMembers
);
if
(
editedMembers
.
length
!==
0
)
{
if
(
addPOC
)
{
await
HTTP
.
put
(
`/teams/
${
team
.
id
}
/members`
,
editedMembers
);
}
if
(
addPOC
.
length
!==
0
)
{
await
HTTP
.
post
(
`/teams/
${
team
.
id
}
/members`
,
addPOC
);
await
HTTP
.
post
(
`/teams/
${
team
.
id
}
/members`
,
addPOC
);
};
};
const
response
=
await
HTTP
.
put
(
`/teams/
${
team
.
id
}
`
,
team
);
const
response
=
await
HTTP
.
put
(
`/teams/
${
team
.
id
}
`
,
team
);
...
@@ -48,9 +50,6 @@ export default {
...
@@ -48,9 +50,6 @@ export default {
});
});
},
},
async
addMembers
(
members
,
teamId
)
{
async
addMembers
(
members
,
teamId
)
{
for
(
let
i
=
0
;
i
<
members
.
length
;
i
++
)
{
await
HTTP
.
post
(
`/teams/
${
teamId
}
/members`
,
members
);
console
.
log
(
"
USER
"
,
members
[
i
]);
await
this
.
addMember
(
members
[
i
],
teamId
,
members
[
i
].
isTeamLead
);
}
},
},
};
};
src/views/Team.vue
View file @
a4ffaa72
...
@@ -323,20 +323,20 @@ export default {
...
@@ -323,20 +323,20 @@ export default {
);
);
currentPOCId
=
currentPOCId
.
map
((
member
)
=>
member
.
id
);
currentPOCId
=
currentPOCId
.
map
((
member
)
=>
member
.
id
);
console
.
log
(
"
ID
"
,
editMembersId
);
console
.
log
(
"
ID
"
,
editMembersId
);
const
addTeamLeads
=
[];
const
addTeamLeads
=
[];
const
editTeamMembers
=
[];
const
editTeamMembers
=
[];
//2 sorting throught the new team leads to decide whether or not they need to be added or updated to team leads
//2 sorting throught the new team leads to decide whether or not they need to be added or updated to team leads
for
(
let
i
=
0
;
i
<
editedTeam
.
poc
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
editedTeam
.
poc
.
length
;
i
++
)
{
//adding
//adding
if
(
!
editMembersId
.
includes
(
editedTeam
.
poc
[
i
].
id
))
{
if
(
!
editMembersId
.
includes
(
editedTeam
.
poc
[
i
].
id
))
{
console
.
log
(
"
ADDING
"
,
editedTeam
.
poc
[
i
].
name
)
console
.
log
(
"
ADDING
"
,
editedTeam
.
poc
[
i
].
name
)
;
addTeamLeads
.
push
({
userId
:
editedTeam
.
poc
[
i
].
id
,
isTeamLead
:
true
});
addTeamLeads
.
push
({
userId
:
editedTeam
.
poc
[
i
].
id
,
isTeamLead
:
true
});
}
//upgrading users
}
//upgrading users
else
if
(
else
if
(
editMembersId
.
includes
(
editedTeam
.
poc
[
i
].
id
)
&&
editMembersId
.
includes
(
editedTeam
.
poc
[
i
].
id
)
&&
!
currentPOCId
.
includes
(
editedTeam
.
poc
[
i
].
id
)
!
currentPOCId
.
includes
(
editedTeam
.
poc
[
i
].
id
)
)
{
)
{
console
.
log
(
"
UPGRADING
"
,
editedTeam
.
poc
[
i
].
name
)
console
.
log
(
"
UPGRADING
"
,
editedTeam
.
poc
[
i
].
name
)
;
editTeamMembers
.
push
({
editTeamMembers
.
push
({
userId
:
editedTeam
.
poc
[
i
].
id
,
userId
:
editedTeam
.
poc
[
i
].
id
,
isTeamLead
:
true
,
isTeamLead
:
true
,
...
@@ -344,14 +344,14 @@ export default {
...
@@ -344,14 +344,14 @@ export default {
}
}
}
}
//seeing a person needs to be removed from team lead
//seeing a person needs to be removed from team lead
editTeamMembers
.
concat
(
const
toADD
=
currentPOCId
.
map
(
function
(
member
)
{
currentPOCId
.
map
(
function
(
member
)
{
if
(
!
newPOCId
.
includes
(
member
)
)
{
if
(
!
newPOCId
.
includes
(
member
)
)
{
console
.
log
(
"
DEMOTING
"
,
member
)
;
console
.
log
(
"
DEMOTING
"
,
member
)
;
return
{
userId
:
member
,
isTeamLead
:
false
}
;
return
{
userId
:
member
,
isTeamLead
:
false
};
}
}
});
})
console
.
log
(
"
ADDING
"
,
toADD
);
);
editTeamMembers
.
concat
(
toADD
);
console
.
log
(
"
addTeamLeads
"
,
addTeamLeads
);
console
.
log
(
"
addTeamLeads
"
,
addTeamLeads
);
console
.
log
(
"
REMOVE TEAM LEAD
"
,
editTeamMembers
);
console
.
log
(
"
REMOVE TEAM LEAD
"
,
editTeamMembers
);
try
{
try
{
...
@@ -380,8 +380,11 @@ export default {
...
@@ -380,8 +380,11 @@ export default {
member
=
this
.
memberToAdd
;
member
=
this
.
memberToAdd
;
}
}
this
.
state
.
isAddingBusy
=
true
;
this
.
state
.
isAddingBusy
=
true
;
member
=
member
.
map
(
function
(
member
)
{
return
{
userId
:
member
.
id
,
isTeamLead
:
true
};
});
try
{
try
{
await
TeamService
.
addMembers
(
member
,
this
.
$route
.
params
.
teamId
,
false
);
await
TeamService
.
addMembers
(
member
,
this
.
$route
.
params
.
teamId
);
this
.
memberToAdd
=
member
;
this
.
memberToAdd
=
member
;
this
.
snackbars
.
add
=
true
;
this
.
snackbars
.
add
=
true
;
}
catch
(
e
)
{
}
catch
(
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment