Skip to content

Commit

Permalink
Harshit & Duck | FakeAction Forms Fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
@harshitagg
harshitagg committed Jun 12, 2012
1 parent 05c444d commit 61241d0
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 113 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ target/
*.ipr
*.iws
logfile
*.log
*.log*
8 changes: 4 additions & 4 deletions drishti-mother-child/src/main/java/org/ei/drishti/domain/Action.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public long timestamp() {
return timeStamp;
}

public String target() {
return actionTarget;
}

@Override
public boolean equals(Object o) {
return EqualsBuilder.reflectionEquals(this, o, false, null, new String[]{"timeStamp"});
Expand All @@ -72,8 +76,4 @@ public int hashCode() {
public String toString() {
return ToStringBuilder.reflectionToString(this);
}

public String target() {
return actionTarget;
}
}
4 changes: 2 additions & 2 deletions drishti-web/src/main/java/org/ei/drishti/web/controller/ActionConvertor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public static Action from(org.ei.drishti.domain.Action action){
return new Action(action.caseID(), action.target(), action.actionType(), action.data(), String.valueOf(action.timestamp()));
}

public static org.ei.drishti.domain.Action toAction(Action actionItem) {
return new org.ei.drishti.domain.Action(actionItem.caseID(), "c", ActionData.from(actionItem.type(), actionItem.target(), actionItem.data()));
public static org.ei.drishti.domain.Action toAction(Action actionItem, String anmIdentifier) {
return new org.ei.drishti.domain.Action(actionItem.caseID(), anmIdentifier, ActionData.from(actionItem.type(), actionItem.target(), actionItem.data()));
}
}
4 changes: 2 additions & 2 deletions drishti-web/src/main/java/org/ei/drishti/web/controller/FakeActionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public FakeActionController(AllActions allActions) {

@RequestMapping(method = RequestMethod.POST, value = "/action/submit")
@ResponseBody
public String submitFakeAction(@RequestParam("formData") String formData) throws Exception {
public String submitFakeAction(@RequestParam("formData") String formData, @RequestParam("anmIdentifier") String anmIdentifier) throws Exception {
try {
allActions.add(ActionConvertor.toAction(new Gson().fromJson(formData, Action.class)));
allActions.add(ActionConvertor.toAction(new Gson().fromJson(formData, Action.class), anmIdentifier));
} catch (Exception e) {
return "Failed: " + e.getMessage();
}
Expand Down
3 changes: 2 additions & 1 deletion drishti-web/src/main/webapp/js/fakeactions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ $(document).ready(function() {
var handleSubmit = function(form) {
var payload = createObjectFrom($(form).children(".field"));
var data = createObjectFrom($(form).children(".data"));
var anmId = $(form).children(".anm")[0].value;
payload['data'] = data;
payload['actionType'] = form.id;

$.post('../action/submit', { formData: JSON.stringify(payload) })
$.post('../action/submit', { formData: JSON.stringify(payload), anmIdentifier: anmId })
.success(function(responseFromServer) { formStatusDisplay(form.id, "Success!"); })
.error(function(responseFromServer, textStatus) {
formStatusDisplay(form.id, "Failed!");
Expand Down
1 change: 0 additions & 1 deletion drishti-web/src/main/webapp/js/fakeforms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ $(document).ready(function() {
form.append($(document.createElement('label')).attr('for', name + "-" + mapping.value).text(mapping.value));
form.append($(document.createElement('input')).attr('type', 'text').attr('id', name + "-" + mapping.value)
.attr('class', 'mapping').change(function() { clearStatusDisplay(name); }));
form.append($(document.createElement('p')));
});

form.append($(document.createElement('input')).attr('type', 'submit').attr('id', name + 'FormSubmit').attr('value', 'Submit form!'));
Expand Down
13 changes: 13 additions & 0 deletions drishti-web/src/main/webapp/stylesheets/fakeforms.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ span.title {

span.formStatus {
color: #0000ff;
clear: left;
float: left;
margin-bottom: 20px;
}

form {
Expand All @@ -15,11 +18,19 @@ form {
div.formDiv {
margin-bottom: 40px;
margin-left: 20px;
clear: left;
}

label {
width: 200px;
clear: left;
float: left;
margin-bottom: 15px;
}

input {
float: left;
margin-bottom: 15px;
}

input[type="text"] {
Expand All @@ -28,6 +39,8 @@ input[type="text"] {

input[type="submit"] {
font-size: 24pt;
clear: left;
margin-left: -2px;
}

div#information {
Expand Down
136 changes: 34 additions & 102 deletions drishti-web/src/main/webapp/test/fakeactions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,134 +17,71 @@
<span class="title">Create Alert</span>

<form id="createAlert" class="form">
<label for="create-caseID">Case ID</label>
<input type="text" id="create-caseID" class="field mapping">
<label for="createAlert-caseID">Case ID</label><input type="text" id="createAlert-caseID" class="field mapping">
<input type="hidden" id="createAlert-actionTarget" class="field mapping" value="alert">

<p></p>

<label for="create-anmIdentifier">ANM ID</label>
<input type="text" id="create-anmIdentifier" class="field mapping">

<p></p>

<label for="create-beneficiaryName">Beneficiary Name</label>
<input type="text" id="create-beneficiaryName" class="data mapping">

<p></p>

<label for="create-village">Village</label>
<input type="text" id="create-village" class="data mapping">

<p></p>

<label for="create-thaayiCardNumber">Thaayi Card</label>
<input type="text" id="create-thaayiCardNumber" class="data mapping">

<p></p>
<label for="createAlert-anmIdentifier">ANM ID</label><input type="text" id="createAlert-anmIdentifier" class="anm mapping">

<label for="create-visitCode">Visit Code</label>
<input type="text" id="create-visitCode" class="data mapping">
<label for="createAlert-beneficiaryName">Beneficiary Name</label><input type="text" id="createAlert-beneficiaryName" class="data mapping">
<label for="createAlert-village">Village</label><input type="text" id="createAlert-village" class="data mapping">
<label for="createAlert-thaayiCardNumber">Thaayi Card</label><input type="text" id="createAlert-thaayiCardNumber" class="data mapping">
<label for="createAlert-visitCode">Visit Code</label><input type="text" id="createAlert-visitCode" class="data mapping">
<label for="createAlert-dueDate">Due Date</label><input type="text" id="createAlert-dueDate" class="data mapping">
<input type="hidden" id="createAlert-latenessStatus" class="data mapping" value="due">

<p></p>

<label for="create-dueDate">Due Date</label>
<input type="text" id="create-dueDate" class="data mapping">

<p></p>

<input type="hidden" id="create-latenessStatus" class="data mapping" value="due">

<p></p>

<input type="submit" id="create-submit" value="Submit form!">
<input type="submit" id="createAlert-submit" value="Submit form!">
</form>

<span class="formStatus" id="create-status" style="opacity: 0; ">.</span>
<span class="formStatus" id="createAlert-status" style="opacity: 0; ">.</span>
</div>

<div id="alertDelete" class="formDiv">
<span class="title">Delete Alerts for a visit code</span>

<form id="deleteAlert" class="form">
<label for="delete-caseID">Case ID</label>
<input type="text" id="delete-caseID" class="field mapping">

<p></p>
<label for="deleteAlert-caseID">Case ID</label><input type="text" id="deleteAlert-caseID" class="field mapping">
<input type="hidden" id="deleteAlert-actionTarget" class="field mapping" value="alert">

<label for="delete-anmIdentifier">ANM ID</label>
<input type="text" id="delete-anmIdentifier" class="field mapping">
<label for="deleteAlert-anmIdentifier">ANM ID</label><input type="text" id="deleteAlert-anmIdentifier" class="anm mapping">

<p></p>

<label for="delete-visitCode">Visit Code</label>
<input type="text" id="delete-visitCode" class="data mapping">
<label for="deleteAlert-visitCode">Visit Code</label><input type="text" id="deleteAlert-visitCode" class="data mapping">

<p></p>

<input type="submit" id="delete-submit" value="Submit form!">
<input type="submit" id="deleteAlert-submit" value="Submit form!">
</form>

<span class="formStatus" id="delete-status" style="opacity: 0; ">.</span>
<span class="formStatus" id="deleteAlert-status" style="opacity: 0; ">.</span>
</div>

<div id="alertDeleteAll" class="formDiv">
<span class="title">Delete All Alerts for a case (mother)</span>

<form id="deleteAllAlerts" class="form">
<label for="deleteAll-caseID">Case ID</label>
<input type="text" id="deleteAll-caseID" class="field mapping">
<label for="deleteAllAlerts-caseID">Case ID</label><input type="text" id="deleteAllAlerts-caseID" class="field mapping">
<input type="hidden" id="deleteAllAlerts-actionTarget" class="field mapping" value="alert">

<p></p>

<label for="deleteAll-anmIdentifier">ANM ID</label>
<input type="text" id="deleteAll-anmIdentifier" class="field mapping">

<p></p>
<label for="deleteAllAlerts-anmIdentifier">ANM ID</label><input type="text" id="deleteAllAlerts-anmIdentifier" class="anm mapping">

<input type="submit" id="deleteAll-submit" value="Submit form!">
<input type="submit" id="deleteAllAlerts-submit" value="Submit form!">
</form>

<span class="formStatus" id="deleteAll-status" style="opacity: 0; ">.</span>
<span class="formStatus" id="deleteAllAlerts-status" style="opacity: 0; ">.</span>
</div>

<div id="ecCreate" class="formDiv">
<span class="title">Create EC</span>

<form id="createEC" class="form">
<label for="createEC-caseID">Case ID</label>
<input type="text" id="createEC-caseID" class="field mapping">

<p></p>

<label for="createEC-anmIdentifier">ANM ID</label>
<input type="text" id="createEC-anmIdentifier" class="field mapping">

<p></p>

<label for="createEC-wife">Wife Name</label>
<input type="text" id="createEC-wife" class="data mapping">

<p></p>

<label for="createEC-husband">Husband Name</label>
<input type="text" id="createEC-husband" class="data mapping">
<label for="createEC-caseID">Case ID</label><input type="text" id="createEC-caseID" class="field mapping">
<input type="hidden" id="createEC-actionTarget" class="field mapping" value="eligibleCouple">

<p></p>

<label for="createEC-ecNumber">EC Number</label>
<input type="text" id="createEC-ecNumber" class="data mapping">

<p></p>

<label for="createEC-village">Village</label>
<input type="text" id="createEC-village" class="data mapping">

<p></p>
<label for="createEC-anmIdentifier">ANM ID</label><input type="text" id="createEC-anmIdentifier" class="anm mapping">

<label for="createEC-subCenter">SubCenter</label>
<input type="text" id="createEC-subCenter" class="data mapping">

<p></p>
<label for="createEC-wife">Wife Name</label><input type="text" id="createEC-wife" class="data mapping">
<label for="createEC-husband">Husband Name</label><input type="text" id="createEC-husband" class="data mapping">
<label for="createEC-ecNumber">EC Number</label><input type="text" id="createEC-ecNumber" class="data mapping">
<label for="createEC-village">Village</label><input type="text" id="createEC-village" class="data mapping">
<label for="createEC-subCenter">SubCenter</label><input type="text" id="createEC-subCenter" class="data mapping">

<input type="submit" id="createEC-submit" value="Submit form!">
</form>
Expand All @@ -156,15 +93,10 @@
<span class="title">Delete EC</span>

<form id="deleteEC" class="form">
<label for="deleteEC-caseID">Case ID</label>
<input type="text" id="deleteEC-caseID" class="field mapping">

<p></p>

<label for="deleteEC-anmIdentifier">ANM ID</label>
<input type="text" id="deleteEC-anmIdentifier" class="field mapping">
<label for="deleteEC-caseID">Case ID</label><input type="text" id="deleteEC-caseID" class="field mapping">
<input type="hidden" id="deleteEC-actionTarget" class="field mapping" value="eligibleCouple">

<p></p>
<label for="deleteEC-anmIdentifier">ANM ID</label><input type="text" id="deleteEC-anmIdentifier" class="anm mapping">

<input type="submit" id="deleteEC-submit" value="Submit form!">
</form>
Expand All @@ -177,4 +109,4 @@
<div id="status"></div>

</body>
</html>
</html>

0 comments on commit 61241d0

Please sign in to comment.