Skip to content

Commit 7cee620

Browse files
committed
Updating DocumentGenerationService.java with dynamic tables
1 parent 53c30b3 commit 7cee620

File tree

7 files changed

+85
-11
lines changed

7 files changed

+85
-11
lines changed

azure-pipelines.yml

+15
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,21 @@ steps:
8888

8989
- script: dir $(Build.SourcesDirectory)/code-examples-java-private/src/main/resources
9090

91+
- script: |
92+
echo "Checking for running Docker containers..."
93+
containers=$(docker ps -q)
94+
if [ ! -z "$containers" ]; then
95+
echo "Stopping running Docker containers..."
96+
docker stop $(docker ps -q)
97+
else
98+
echo "No Docker containers are running."
99+
fi
100+
displayName: "check for running containers"
101+
102+
- script: |
103+
docker system prune -a --force
104+
displayName: "cleanup docker files"
105+
91106
- task: Docker@2
92107
displayName: Build java image
93108
inputs:

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<oauth2.version>2.5.6</oauth2.version>
2727
<commonsio.version>2.11.0</commonsio.version>
2828

29-
<esignature.version>4.5.0</esignature.version>
29+
<esignature.version>4.6.0-RC1</esignature.version>
3030
<rooms.version>1.4.3</rooms.version>
3131
<click.version> 1.4.0</click.version>
3232
<monitor.version>1.3.0</monitor.version>

src/main/java/com/docusign/common/WorkArguments.java

+2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ public class WorkArguments {
156156

157157
private String salary;
158158

159+
private String rsus;
160+
159161
private String agentEmail;
160162

161163
private String agentName;

src/main/java/com/docusign/controller/eSignature/examples/EG042ControllerDocumentGeneration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public class EG042ControllerDocumentGeneration extends AbstractEsignatureController {
2323
public static final String EG_042 = "/eg042";
2424

25-
private static final String DOCUMENT_FILE_NAME = "Offer_Letter_Demo.docx";
25+
private static final String DOCUMENT_FILE_NAME = "Offer_Letter_Dynamic_Table.docx";
2626

2727
@Autowired
2828
public EG042ControllerDocumentGeneration(DSConfiguration config, Session session, User user) {
@@ -45,6 +45,7 @@ protected Object doWork(WorkArguments args, ModelMap model,
4545
args.getManagerName(),
4646
args.getJobTitle(),
4747
args.getSalary(),
48+
args.getRsus(),
4849
args.getStartDate(),
4950
DOCUMENT_FILE_NAME,
5051
envelopesApi,

src/main/java/com/docusign/controller/eSignature/services/DocumentGenerationService.java

+49-7
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,18 @@ public final class DocumentGenerationService {
2222

2323
public static final String SALARY = "Salary";
2424

25+
public static final String BONUS = "Bonus";
26+
27+
public static final String RSUS = "RSUs";
28+
2529
public static final String START_DATE = "Start_Date";
2630

31+
public static final String COMPENSATION_PACKAGE = "Compensation_Package";
32+
33+
public static final String COMPENSATION_COMPONENT = "Compensation_Component";
34+
35+
public static final String DETAILS = "Details";
36+
2737
public static final String TEXT_BOX = "TextBox";
2838

2939
public static final String STRING_TRUE = "true";
@@ -53,6 +63,7 @@ public String generateDocument(
5363
String managerName,
5464
String jobTitle,
5565
String salary,
66+
String rsus,
5667
String startDate,
5768
String offerDocDocx,
5869
EnvelopesApi envelopesApi,
@@ -96,6 +107,7 @@ public String generateDocument(
96107
managerName,
97108
jobTitle,
98109
salary,
110+
rsus,
99111
startDate);
100112

101113
envelopesApi.updateEnvelopeDocGenFormFields(accountId, envelopeId, formFields);
@@ -136,7 +148,7 @@ private SignHere createSignHere() {
136148
private DateSigned createDateSigned() {
137149
DateSigned dateSigned = new DateSigned();
138150

139-
dateSigned.setAnchorString("Date");
151+
dateSigned.setAnchorString("Date Signed");
140152
dateSigned.setAnchorUnits(ANCHOR_UNITS);
141153
dateSigned.setAnchorYOffset("-22");
142154

@@ -151,6 +163,7 @@ private DocGenFormFieldRequest getFormFields(
151163
String managerName,
152164
String jobTitle,
153165
String salary,
166+
String rsus,
154167
String startDate) {
155168
DocGenFormField candidateNameField = new DocGenFormField();
156169
candidateNameField.setName(CANDIDATE_NAME);
@@ -164,21 +177,50 @@ private DocGenFormFieldRequest getFormFields(
164177
jobTitleField.setName(JOB_TITLE);
165178
jobTitleField.setValue(jobTitle);
166179

167-
DocGenFormField salaryField = new DocGenFormField();
168-
salaryField.setName(SALARY);
169-
salaryField.setValue(salary);
170-
171180
DocGenFormField startDateField = new DocGenFormField();
172181
startDateField.setName(START_DATE);
173182
startDateField.setValue(startDate);
174183

184+
DocGenFormField compensationPackageField = new DocGenFormField();
185+
compensationPackageField.setName(COMPENSATION_PACKAGE);
186+
compensationPackageField.setType("TableRow");
187+
compensationPackageField.setRowValues(Arrays.asList(
188+
new DocGenFormFieldRowValue()
189+
.docGenFormFieldList(Arrays.asList(
190+
new DocGenFormField()
191+
.name(COMPENSATION_COMPONENT)
192+
.value(SALARY),
193+
new DocGenFormField()
194+
.name(DETAILS)
195+
.value("$" + salary)
196+
)),
197+
new DocGenFormFieldRowValue()
198+
.docGenFormFieldList(Arrays.asList(
199+
new DocGenFormField()
200+
.name(COMPENSATION_COMPONENT)
201+
.value(BONUS),
202+
new DocGenFormField()
203+
.name(DETAILS)
204+
.value("20%")
205+
)),
206+
new DocGenFormFieldRowValue()
207+
.docGenFormFieldList(Arrays.asList(
208+
new DocGenFormField()
209+
.name(COMPENSATION_COMPONENT)
210+
.value(RSUS),
211+
new DocGenFormField()
212+
.name(DETAILS)
213+
.value(rsus)
214+
))
215+
));
216+
175217
DocGenFormFields formFields = new DocGenFormFields();
176218
formFields.setDocGenFormFieldList(Arrays.asList(
177219
candidateNameField,
178220
managerNameField,
179221
jobTitleField,
180-
salaryField,
181-
startDateField));
222+
startDateField,
223+
compensationPackageField));
182224
formFields.setDocumentId(documentId);
183225

184226
DocGenFormFieldRequest docGenFormFieldRequest = new DocGenFormFieldRequest();
Binary file not shown.

src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg042.jsp

+16-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<c:set var="jobTitleIndex" value="3" scope="page" />
99
<c:set var="salaryIndex" value="4" scope="page" />
1010
<c:set var="startDateIndex" value="5" scope="page" />
11+
<c:set var="rsusIndex" value="6" scope="page" />
1112

1213
<h4>${example.getExampleName()}</h4>
1314
<p>${example.getExampleDescription()}</p>
@@ -75,8 +76,7 @@
7576

7677
<select class="form-control" id="jobTitle" name="jobTitle">
7778
<option value="Software Engineer">Software Engineer</option>
78-
<option value="Product Manager">Product Manager</option>
79-
<option value="Sales Representative">Sales Representative</option>
79+
<option value="Account Executive">Account Executive</option>
8080
</select>
8181
</div>
8282

@@ -93,6 +93,20 @@
9393
required>
9494
</div>
9595

96+
<div class="form-group">
97+
<label for="rsus">
98+
${example.getForms().get(formNumber).getInputs().get(rsusIndex).getInputName()}
99+
</label>
100+
101+
<input type="number"
102+
min="0"
103+
class="form-control"
104+
id="rsus"
105+
placeholder="${example.getForms().get(formNumber).getInputs().get(rsusIndex).getInputPlaceholder()}"
106+
name="rsus"
107+
required>
108+
</div>
109+
96110
<div class="form-group">
97111
<label for="startDate">
98112
${example.getForms().get(formNumber).getInputs().get(startDateIndex).getInputName()}

0 commit comments

Comments
 (0)