Skip to content

Commit 67e2c47

Browse files
AaronWDSAaronWDS
committed
Revert "small fixes"
This reverts commit be0d2fe.
1 parent be0d2fe commit 67e2c47

4 files changed

Lines changed: 111 additions & 10 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"java.configuration.updateBuildConfiguration": "automatic",
3-
"java.compile.nullAnalysis.mode": "automatic"
2+
"java.configuration.updateBuildConfiguration": "automatic"
43
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ protected Object doWork(WorkArguments args, ModelMap model,
4444
session.getAccountId(),
4545
args.getCandidateEmail(),
4646
args.getCandidateName(),
47+
args.getManagerName(),
48+
args.getJobTitle(),
49+
args.getSalary(),
50+
args.getStartDate(),
4751
DOCUMENT_FILE_NAME,
4852
envelopesApi,
4953
templatesApi);

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

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
*/
3232
public final class DocumentGenerationService {
3333
public static final String CANDIDATE_NAME = "Candidate_Name";
34+
public static final String MANAGER_NAME = "Manager_Name";
35+
public static final String JOB_TITLE = "Job_Title";
36+
public static final String SALARY = "Salary";
37+
public static final String START_DATE = "Start_Date";
3438
public static final String TEXT_BOX = "TextBox";
3539
public static final String STRING_TRUE = "true";
3640
public static final String ANCHOR_UNITS = "pixels";
@@ -40,6 +44,10 @@ public String generateDocument(
4044
String accountId,
4145
String candidateEmail,
4246
String candidateName,
47+
String managerName,
48+
String jobTitle,
49+
String salary,
50+
String startDate,
4351
String offerDocDocx,
4452
EnvelopesApi envelopesApi,
4553
TemplatesApi templatesApi
@@ -66,8 +74,11 @@ public String generateDocument(
6674

6775
DocGenFormFieldRequest formFields = getFormFields(
6876
documentId,
69-
candidateName
70-
);
77+
candidateName,
78+
managerName,
79+
jobTitle,
80+
salary,
81+
startDate);
7182

7283
envelopesApi.updateEnvelopeDocGenFormFields(accountId, envelopeId, formFields);
7384

@@ -113,20 +124,53 @@ public static DateSigned createDateSigned() {
113124

114125
private DocGenFormFieldRequest getFormFields(
115126
String documentId,
116-
String candidateName
117-
) {
127+
String candidateName,
128+
String managerName,
129+
String jobTitle,
130+
String salary,
131+
String startDate) {
118132
DocGenFormField candidateNameField = new DocGenFormField();
119133
candidateNameField.setLabel(CANDIDATE_NAME);
120134
candidateNameField.setRequired(STRING_TRUE);
121135
candidateNameField.setType(TEXT_BOX);
122136
candidateNameField.setName(CANDIDATE_NAME);
123137
candidateNameField.setValue(candidateName);
124138

125-
139+
DocGenFormField managerNameField = new DocGenFormField();
140+
managerNameField.setLabel(MANAGER_NAME);
141+
managerNameField.setRequired(STRING_TRUE);
142+
managerNameField.setType(TEXT_BOX);
143+
managerNameField.setName(MANAGER_NAME);
144+
managerNameField.setValue(managerName);
145+
146+
DocGenFormField jobTitleField = new DocGenFormField();
147+
jobTitleField.setLabel(JOB_TITLE);
148+
jobTitleField.setRequired(STRING_TRUE);
149+
jobTitleField.setType(TEXT_BOX);
150+
jobTitleField.setName(JOB_TITLE);
151+
jobTitleField.setValue(jobTitle);
152+
153+
DocGenFormField salaryField = new DocGenFormField();
154+
salaryField.setLabel(SALARY);
155+
salaryField.setRequired(STRING_TRUE);
156+
salaryField.setType(TEXT_BOX);
157+
salaryField.setName(SALARY);
158+
salaryField.setValue(salary);
159+
160+
DocGenFormField startDateField = new DocGenFormField();
161+
startDateField.setLabel(START_DATE);
162+
startDateField.setRequired(STRING_TRUE);
163+
startDateField.setType(TEXT_BOX);
164+
startDateField.setName(START_DATE);
165+
startDateField.setValue(startDate);
126166

127167
DocGenFormFields formFields = new DocGenFormFields();
128168
formFields.setDocGenFormFieldList(Arrays.asList(
129-
candidateNameField));
169+
candidateNameField,
170+
managerNameField,
171+
jobTitleField,
172+
salaryField,
173+
startDateField));
130174
formFields.setDocumentId(documentId);
131175

132176
DocGenFormFieldRequest docGenFormFieldRequest = new DocGenFormFieldRequest();

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

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<c:set var="formNumber" value="0" scope="page" />
55
<c:set var="candidateEmailIndex" value="0" scope="page" />
66
<c:set var="candidateNameIndex" value="1" scope="page" />
7-
7+
<c:set var="managerNameIndex" value="2" scope="page" />
8+
<c:set var="jobTitleIndex" value="3" scope="page" />
9+
<c:set var="salaryIndex" value="4" scope="page" />
10+
<c:set var="startDateIndex" value="5" scope="page" />
811

912
<h4>${example.getExampleName()}</h4>
1013
<p>${example.getExampleDescription()}</p>
@@ -51,7 +54,58 @@
5154
name="candidateName"
5255
required>
5356
</div>
54-
57+
<div class="form-group">
58+
<label for="managerName">
59+
${example.getForms().get(formNumber).getInputs().get(managerNameIndex).getInputName()}
60+
</label>
61+
62+
<input type="tel"
63+
class="form-control"
64+
id="managerName"
65+
name="managerName"
66+
aria-describedby="accessHelp"
67+
placeholder="${example.getForms().get(formNumber).getInputs().get(managerNameIndex).getInputPlaceholder()}"
68+
required/>
69+
</div>
70+
71+
<div class="form-group">
72+
<label for="jobTitle">
73+
${example.getForms().get(formNumber).getInputs().get(jobTitleIndex).getInputName()}
74+
</label>
75+
76+
<select class="form-control" id="jobTitle" name="jobTitle">
77+
<option value="Software Engineer">Software Engineer</option>
78+
<option value="Product Manager">Product Manager</option>
79+
<option value="Sales Representative">Sales Representative</option>
80+
</select>
81+
</div>
82+
83+
<div class="form-group">
84+
<label for="salary">
85+
${example.getForms().get(formNumber).getInputs().get(salaryIndex).getInputName()}
86+
</label>
87+
88+
<input type="text"
89+
class="form-control"
90+
id="salary"
91+
placeholder="${example.getForms().get(formNumber).getInputs().get(salaryIndex).getInputPlaceholder()}"
92+
name="salary"
93+
required>
94+
</div>
95+
96+
<div class="form-group">
97+
<label for="startDate">
98+
${example.getForms().get(formNumber).getInputs().get(startDateIndex).getInputName()}
99+
</label>
100+
101+
<input type="date"
102+
class="form-control"
103+
id="startDate"
104+
name="startDate"
105+
aria-describedby="accessHelp"
106+
placeholder="${example.getForms().get(formNumber).getInputs().get(startDateIndex).getInputPlaceholder()}"
107+
required/>
108+
</div>
55109

56110
<input type="hidden" name="_csrf" value="${csrfToken}">
57111
<button type="submit" class="btn btn-docu">${launcherTexts.getSubmitButton()}</button>

0 commit comments

Comments
 (0)