Updating DocumentGenerationService.java with dynamic tables

docusign · Apr 16, 2024 · 7cee620 · 7cee620
1 parent 53c30b3
commit 7cee620
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 11 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -88,6 +88,21 @@ steps:
 
 - script: dir $(Build.SourcesDirectory)/code-examples-java-private/src/main/resources
 
+- script: |
+    echo "Checking for running Docker containers..."
+    containers=$(docker ps -q)
+    if [ ! -z "$containers" ]; then
+      echo "Stopping running Docker containers..."
+      docker stop $(docker ps -q)
+    else
+      echo "No Docker containers are running."
+    fi
+  displayName: "check for running containers"
+
+- script: |
+    docker system prune -a --force
+  displayName: "cleanup docker files"
+
 - task: Docker@2
   displayName: Build java image
   inputs:

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
         <oauth2.version>2.5.6</oauth2.version>
         <commonsio.version>2.11.0</commonsio.version>
 
-        <esignature.version>4.5.0</esignature.version>
+        <esignature.version>4.6.0-RC1</esignature.version>
         <rooms.version>1.4.3</rooms.version>
         <click.version> 1.4.0</click.version>
         <monitor.version>1.3.0</monitor.version>

diff --git a/src/main/java/com/docusign/common/WorkArguments.java b/src/main/java/com/docusign/common/WorkArguments.java
@@ -156,6 +156,8 @@ public class WorkArguments {
 
     private String salary;
 
+    private String rsus;
+
     private String agentEmail;
 
     private String agentName;

diff --git a/...n/java/com/docusign/controller/eSignature/examples/EG042ControllerDocumentGeneration.java b/...n/java/com/docusign/controller/eSignature/examples/EG042ControllerDocumentGeneration.java
@@ -22,7 +22,7 @@
 public class EG042ControllerDocumentGeneration extends AbstractEsignatureController {
     public static final String EG_042 = "/eg042";
 
-    private static final String DOCUMENT_FILE_NAME = "Offer_Letter_Demo.docx";
+    private static final String DOCUMENT_FILE_NAME = "Offer_Letter_Dynamic_Table.docx";
 
     @Autowired
     public EG042ControllerDocumentGeneration(DSConfiguration config, Session session, User user) {
@@ -45,6 +45,7 @@ protected Object doWork(WorkArguments args, ModelMap model,
                 args.getManagerName(),
                 args.getJobTitle(),
                 args.getSalary(),
+                args.getRsus(),
                 args.getStartDate(),
                 DOCUMENT_FILE_NAME,
                 envelopesApi,

diff --git a/src/main/java/com/docusign/controller/eSignature/services/DocumentGenerationService.java b/src/main/java/com/docusign/controller/eSignature/services/DocumentGenerationService.java
@@ -22,8 +22,18 @@ public final class DocumentGenerationService {
 
     public static final String SALARY = "Salary";
 
+    public static final String BONUS = "Bonus";
+
+    public static final String RSUS = "RSUs";
+
     public static final String START_DATE = "Start_Date";
 
+    public static final String COMPENSATION_PACKAGE = "Compensation_Package";
+
+    public static final String COMPENSATION_COMPONENT = "Compensation_Component";
+
+    public static final String DETAILS = "Details";
+
     public static final String TEXT_BOX = "TextBox";
 
     public static final String STRING_TRUE = "true";
@@ -53,6 +63,7 @@ public String generateDocument(
             String managerName,
             String jobTitle,
             String salary,
+            String rsus,
             String startDate,
             String offerDocDocx,
             EnvelopesApi envelopesApi,
@@ -96,6 +107,7 @@ public String generateDocument(
                 managerName,
                 jobTitle,
                 salary,
+                rsus,
                 startDate);
 
         envelopesApi.updateEnvelopeDocGenFormFields(accountId, envelopeId, formFields);
@@ -136,7 +148,7 @@ private SignHere createSignHere() {
     private DateSigned createDateSigned() {
       DateSigned dateSigned = new DateSigned();
 
-      dateSigned.setAnchorString("Date");
+      dateSigned.setAnchorString("Date Signed");
       dateSigned.setAnchorUnits(ANCHOR_UNITS);
       dateSigned.setAnchorYOffset("-22");
 
@@ -151,6 +163,7 @@ private DocGenFormFieldRequest getFormFields(
             String managerName,
             String jobTitle,
             String salary,
+            String rsus,
             String startDate) {
         DocGenFormField candidateNameField = new DocGenFormField();
         candidateNameField.setName(CANDIDATE_NAME);
@@ -164,21 +177,50 @@ private DocGenFormFieldRequest getFormFields(
         jobTitleField.setName(JOB_TITLE);
         jobTitleField.setValue(jobTitle);
 
-        DocGenFormField salaryField = new DocGenFormField();
-        salaryField.setName(SALARY);
-        salaryField.setValue(salary);
-
         DocGenFormField startDateField = new DocGenFormField();
         startDateField.setName(START_DATE);
         startDateField.setValue(startDate);
 
+        DocGenFormField compensationPackageField = new DocGenFormField();
+        compensationPackageField.setName(COMPENSATION_PACKAGE);
+        compensationPackageField.setType("TableRow");
+        compensationPackageField.setRowValues(Arrays.asList(
+            new DocGenFormFieldRowValue()
+                .docGenFormFieldList(Arrays.asList(
+                    new DocGenFormField()
+                        .name(COMPENSATION_COMPONENT)
+                        .value(SALARY),
+                    new DocGenFormField()
+                        .name(DETAILS)
+                        .value("$" + salary)
+                )),
+            new DocGenFormFieldRowValue()
+                .docGenFormFieldList(Arrays.asList(
+                    new DocGenFormField()
+                        .name(COMPENSATION_COMPONENT)
+                        .value(BONUS),
+                    new DocGenFormField()
+                        .name(DETAILS)
+                        .value("20%")
+                )),
+            new DocGenFormFieldRowValue()
+                .docGenFormFieldList(Arrays.asList(
+                    new DocGenFormField()
+                        .name(COMPENSATION_COMPONENT)
+                        .value(RSUS),
+                    new DocGenFormField()
+                        .name(DETAILS)
+                        .value(rsus)
+                ))
+        ));
+
         DocGenFormFields formFields = new DocGenFormFields();
         formFields.setDocGenFormFieldList(Arrays.asList(
                 candidateNameField,
                 managerNameField,
                 jobTitleField,
-                salaryField,
-                startDateField));
+                startDateField,
+                compensationPackageField));
         formFields.setDocumentId(documentId);
 
         DocGenFormFieldRequest docGenFormFieldRequest = new DocGenFormFieldRequest();

diff --git a/src/main/resources/Offer_Letter_Dynamic_Table.docx b/src/main/resources/Offer_Letter_Dynamic_Table.docx
diff --git a/src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg042.jsp b/src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg042.jsp
@@ -8,6 +8,7 @@
 <c:set var="jobTitleIndex" value="3" scope="page" />
 <c:set var="salaryIndex" value="4" scope="page" />
 <c:set var="startDateIndex" value="5" scope="page" />
+<c:set var="rsusIndex" value="6" scope="page" />
 
 <h4>${example.getExampleName()}</h4>
 <p>${example.getExampleDescription()}</p>
@@ -75,8 +76,7 @@
 
         <select class="form-control" id="jobTitle" name="jobTitle">
             <option value="Software Engineer">Software Engineer</option>
-            <option value="Product Manager">Product Manager</option>
-            <option value="Sales Representative">Sales Representative</option>
+            <option value="Account Executive">Account Executive</option>
         </select>
     </div>
 
@@ -93,6 +93,20 @@
                required>
     </div>
 
+    <div class="form-group">
+        <label for="rsus">
+            ${example.getForms().get(formNumber).getInputs().get(rsusIndex).getInputName()}
+        </label>
+
+        <input type="number"
+               min="0"
+               class="form-control"
+               id="rsus"
+               placeholder="${example.getForms().get(formNumber).getInputs().get(rsusIndex).getInputPlaceholder()}"
+               name="rsus"
+               required>
+    </div>
+
     <div class="form-group">
         <label for="startDate">
             ${example.getForms().get(formNumber).getInputs().get(startDateIndex).getInputName()}