Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
program-service
Commits
e86f33e2
Unverified
Commit
e86f33e2
authored
3 years ago
by
Kartheek Palla
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #174 from ahghatol/fix
Issue #SB-000 fix: Added missing cols
parents
a3d62280
1e216cfc
SB-23374
SB-25924
copy_issue
copy_issue1
dependabot/npm_and_yarn/src/ajv-6.12.6
dependabot/npm_and_yarn/src/async-2.6.4
dependabot/npm_and_yarn/src/axios-0.21.2
dependabot/npm_and_yarn/src/decode-uri-component-0.2.2
dependabot/npm_and_yarn/src/jsonwebtoken-9.0.0
dependabot/npm_and_yarn/src/lodash-4.17.21
dependabot/npm_and_yarn/src/moment-2.29.4
dependabot/npm_and_yarn/src/moment-timezone-0.5.37
dependabot/npm_and_yarn/src/node-fetch-2.6.7
dependabot/npm_and_yarn/src/pathval-1.1.1
dependabot/npm_and_yarn/src/qs-and-body-parser-and-express-6.5.3
dependabot/npm_and_yarn/src/redis-3.1.1
dependabot/npm_and_yarn/src/simple-get-2.8.2
dependabot/npm_and_yarn/src/underscore-1.12.1
log_issue
master
questionset-integration
release-4.1.0
release-4.1.1
release-4.2.0
release-4.3.0
release-4.4.0
release-4.5.0
release-4.6.0
release-4.7.0
release-4.8.0
release-4.9.0
release-5.1.0
sb-22518
test-issue
vk-local-ps-4.4.0
release-5.1.0_RC1
release-4.9.0_RC1
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.6.0_RC6
release-4.6.0_RC5
release-4.6.0_RC4
release-4.6.0_RC3
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0_RC1
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0_RC9
release-4.2.0_RC8
release-4.2.0_RC7
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.1_RC1
release-4.1.0_RC2
release-4.1.0_RC1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/sql-data/dummy.sql
+6
-1
src/sql-data/dummy.sql
src/test/service/printService.js
+1
-1
src/test/service/printService.js
src/test/service/programServiceSpec.js
+8
-4
src/test/service/programServiceSpec.js
with
15 additions
and
6 deletions
+15
-6
src/sql-data/dummy.sql
+
6
−
1
View file @
e86f33e2
...
...
@@ -26,6 +26,10 @@ CREATE TABLE program
createdon
timestamp
with
time
zone
DEFAULT
timezone
(
'utc'
::
text
,
now
()),
updatedby
character
varying
COLLATE
pg_catalog
.
"default"
,
updatedon
timestamp
with
time
zone
DEFAULT
timezone
(
'utc'
::
text
,
now
()),
targetprimarycategories
text
[],
targetprimarycategorynames
text
[],
guidelines_url
text
,
rolemapping
json
,
CONSTRAINT
pk_program_id
PRIMARY
KEY
(
program_id
)
);
...
...
@@ -46,10 +50,11 @@ CREATE TABLE nomination
createdon
timestamp
with
time
zone
DEFAULT
timezone
(
'utc'
::
text
,
now
()),
updatedby
character
varying
COLLATE
pg_catalog
.
"default"
,
updatedon
timestamp
with
time
zone
,
targetprimarycategories
text
[],
targetprimarycategorynames
text
[],
CONSTRAINT
pk_id
PRIMARY
KEY
(
id
)
);
CREATE
SEQUENCE
IF
NOT
EXISTS
contentid_seq
;
CREATE
TYPE
contenttypesenum
AS
ENUM
(
'TeachingMethod'
,
'PedagogyFlow'
,
'FocusSpot'
,
'LearningOutcomeDefinition'
,
'PracticeQuestionSet'
,
'CuriosityQuestionSet'
,
'MarkingSchemeRubric'
,
'ExplanationResource'
,
'ExperientialResource'
,
'ConceptMap'
,
'SelfAssess'
);
CREATE
TABLE
contenttypes
(
...
...
This diff is collapsed.
Click to expand it.
src/test/service/printService.js
+
1
−
1
View file @
e86f33e2
...
...
@@ -117,7 +117,7 @@ describe("Print Service", () => {
});
});
it
(
"
[Integration test] should return a PDF for correct Hierarchy ID
"
,
(
done
)
=>
{
x
it
(
"
[Integration test] should return a PDF for correct Hierarchy ID
"
,
(
done
)
=>
{
pdf
.
buildPDFWithCallback
(
"
do_11326731857693900818
"
,
(
base64PDF
,
error
,
errorMsg
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
src/test/service/programServiceSpec.js
+
8
−
4
View file @
e86f33e2
...
...
@@ -337,8 +337,10 @@ describe("Program Service", () => {
.
send
({
request
:
{
filters
:
{
enrolled_id
:
{
user_id
:
dummyData
.
nominationAdd
.
user_id
,
nomination
:
{
user_id
:
{
eq
:
dummyData
.
nominationAdd
.
user_id
},
},
},
},
...
...
@@ -629,8 +631,10 @@ describe("Program Service", () => {
.
send
({
request
:
{
filters
:
{
enrolled_id
:
{
user_id
:
"
cca53828-8111-4d71-9c45-40e569f13bad
"
,
nomination
:{
user_id
:
{
eq
:
"
cca53828-8111-4d71-9c45-40e569f13bad
"
}
},
status
:
[
"
Live
"
],
medium
:
[
"
English
"
],
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets