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
bddc0e9d
Commit
bddc0e9d
authored
2 years ago
by
snehar-nd
Browse files
Options
Download
Patches
Plain Diff
SB-29684- Instructions values null
parent
cc901a0b
release-5.1.0
release-4.8.0
release-4.9.0
release-5.1.0_RC1
release-4.9.0_RC1
release-4.8.0_RC3
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/service/print/getdocxdata.js
+12
-1
src/service/print/getdocxdata.js
src/service/print/printDocxV1.0/dataImporter.js
+2
-5
src/service/print/printDocxV1.0/dataImporter.js
src/service/print/printDocxV1.0/docx.js
+1
-1
src/service/print/printDocxV1.0/docx.js
with
15 additions
and
7 deletions
+15
-7
src/service/print/getdocxdata.js
+
12
−
1
View file @
bddc0e9d
...
...
@@ -295,7 +295,8 @@ function create(data, paperData) {
function
instructions
(
data
)
{
const
arr
=
[];
data
if
(
data
!==
undefined
){
data
.
map
((
text
)
=>
{
arr
.
push
(
new
TextRun
({
...
...
@@ -313,6 +314,16 @@ function instructions(data) {
},
children
:
arr
,
});
}
else
{
return
new
Paragraph
({
alignment
:
AlignmentType
.
LEFT
,
indent
:
{
left
:
720
,
},
children
:
arr
,
});
}
}
function
displayMTFHeader
(
data
)
{
return
new
TableCell
({
...
...
This diff is collapsed.
Click to expand it.
src/service/print/printDocxV1.0/dataImporter.js
+
2
−
5
View file @
bddc0e9d
...
...
@@ -67,7 +67,7 @@ const getQuestionSet = async (id) => {
});
// Hierarchy
const
instructions
=
await
getQuestionForSet
(
id
);
const
promiseMap
=
questionIds
.
map
((
sec
)
=>
sec
.
map
((
question
)
=>
{
if
(
question
!==
undefined
)
{
...
...
@@ -94,13 +94,10 @@ const getQuestionSet = async (id) => {
questions
:
questions
,
};
});
return
{
sectionData
,
paperData
:
data
,
instructions
:
instructions
.
instructions
.
default
instructions
:
instructions
.
instructions
===
undefined
?
undefined
:
instructions
.
instructions
.
default
};
});
})
...
...
This diff is collapsed.
Click to expand it.
src/service/print/printDocxV1.0/docx.js
+
1
−
1
View file @
bddc0e9d
...
...
@@ -33,7 +33,7 @@ const buildDOCX_1_WithCallback = async (id, callback) => {
examName
:
examName
,
className
:
grade
,
subject
:
subject
,
instructions
:
instructions
.
split
(
/
\n
/
),
instructions
:
instructions
==
undefined
?
undefined
:
instructions
.
split
(
/
\n
/
),
};
let
questionCounter
=
0
;
...
...
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