Skip to content

Commit 66bc80f

Browse files
authored
Merge pull request #46 from openo-beta/develop/dogfish
Development merge
2 parents 076b8b8 + c050870 commit 66bc80f

76 files changed

Lines changed: 307 additions & 196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/ca/openosp/openo/tags/Tag.java

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,69 @@
2626

2727
package ca.openosp.openo.tags;
2828

29+
/**
30+
* Represents a tag that can be associated with various objects within the application.
31+
* This class is a simple Plain Old Java Object (POJO) or JavaBean that encapsulates the properties of a tag.
32+
* A tag primarily consists of a unique identifier and a human-readable name.
33+
* For example, a tag could be used to categorize patients, documents, or appointments.
34+
*/
2935
public class Tag {
36+
/**
37+
* The unique identifier for the tag. This is typically a primary key from a database,
38+
* ensuring that each tag can be uniquely referenced.
39+
*/
3040
private String tagId;
41+
/**
42+
* The human-readable name of the tag. This is the value that is typically displayed
43+
* to the user in the user interface. For example, "High Priority" or "Follow-up Required".
44+
*/
3145
private String tagName;
3246

3347
/**
34-
* Creates a new instance of Tag
48+
* Creates a new, empty instance of a Tag.
49+
* This no-argument constructor is useful for frameworks that require it for instantiation,
50+
* after which the properties of the tag can be set using the available setter methods.
3551
*/
3652
public Tag() {
3753
}
3854

55+
/**
56+
* Retrieves the name of the tag.
57+
* This name is the human-readable identifier for the tag.
58+
*
59+
* @return A <code>String</code> representing the name of the tag.
60+
*/
3961
public String getTagName() {
4062
return tagName;
4163
}
4264

65+
/**
66+
* Sets the name of the tag.
67+
* This method allows for updating the human-readable name that represents this tag.
68+
*
69+
* @param tagName The <code>String</code> to be used as the new name for the tag.
70+
*/
4371
public void setTagName(String tagName) {
4472
this.tagName = tagName;
4573
}
4674

75+
/**
76+
* Retrieves the unique identifier of the tag.
77+
* This ID is used to uniquely identify the tag within the system, often corresponding
78+
* to a database primary key.
79+
*
80+
* @return A <code>String</code> representing the unique identifier of the tag.
81+
*/
4782
public String getTagId() {
4883
return tagId;
4984
}
5085

86+
/**
87+
* Sets the unique identifier for the tag.
88+
* This method is used to assign a specific, unique ID to this tag instance.
89+
*
90+
* @param tagId The <code>String</code> to be used as the unique identifier for the tag.
91+
*/
5192
public void setTagId(String tagId) {
5293
this.tagId = tagId;
5394
}

src/main/java/ca/openosp/openo/tags/TagObject.java

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,99 @@
2828

2929
import java.util.ArrayList;
3030

31-
31+
/**
32+
* Represents a generic object within the application that can have tags associated with it.
33+
* This class acts as a data transfer object (DTO) to bundle an object's identity
34+
* with a list of tags that have been assigned to it. It is used to manage the
35+
* relationship between any taggable item and its tags.
36+
*/
3237
public class TagObject {
38+
/**
39+
* A list of tags that are currently assigned to this object.
40+
* Note: This is a raw {@link ArrayList} for compatibility with older Java versions.
41+
* It is intended to store a collection of {@link String} objects, where each string
42+
* is the name of a {@link Tag}.
43+
*/
3344
private ArrayList assignedTags;
45+
/**
46+
* The unique identifier for the object being tagged. This ID allows the application
47+
* to retrieve the specific instance of the object from the database or another data source.
48+
* For example, this could be a patient's demographic number or a unique ID for a document.
49+
*/
3450
private String objectId;
51+
/**
52+
* The fully qualified class name of the object being tagged (e.g., "ca.openosp.demographic.Demographic").
53+
* This provides crucial context, allowing the application to know what type of object
54+
* the {@link #objectId} refers to.
55+
*/
3556
private String objectClass;
3657

58+
/**
59+
* Assigns a new tag to this object by adding the tag's name to the list of assigned tags.
60+
* This is a convenience method that simplifies the process of adding a single tag.
61+
*
62+
* @param tagName The name of the tag to be assigned. This should correspond to the
63+
* {@link Tag#tagName} of an existing tag.
64+
*/
3765
public void assignTag(String tagName) {
3866
getAssignedTags().add(tagName);
3967
}
4068

69+
/**
70+
* Retrieves the list of tags that have been assigned to this object.
71+
* The list contains the names of the tags as {@link String}s.
72+
*
73+
* @return An {@link ArrayList} of {@link String}s, where each string is the name of an assigned tag.
74+
* Returns the underlying list directly.
75+
*/
4176
public ArrayList getAssignedTags() {
4277
return assignedTags;
4378
}
4479

80+
/**
81+
* Sets the list of assigned tags for this object. This method will replace any
82+
* existing list of tags with the one provided.
83+
*
84+
* @param assignedTags An {@link ArrayList} containing the names (as {@link String}s)
85+
* of all tags to be assigned to this object.
86+
*/
4587
public void setAssignedTags(ArrayList assignedTags) {
4688
this.assignedTags = assignedTags;
4789
}
4890

91+
/**
92+
* Retrieves the unique identifier of the object that this TagObject represents.
93+
*
94+
* @return A {@link String} containing the unique ID of the tagged object.
95+
*/
4996
public String getObjectId() {
5097
return objectId;
5198
}
5299

100+
/**
101+
* Sets the unique identifier of the object that this TagObject represents.
102+
*
103+
* @param objectId A {@link String} containing the unique ID to be assigned to this object.
104+
*/
53105
public void setObjectId(String objectId) {
54106
this.objectId = objectId;
55107
}
56108

109+
/**
110+
* Retrieves the fully qualified class name of the object that this TagObject represents.
111+
* This helps in identifying what kind of entity is being tagged.
112+
*
113+
* @return A {@link String} containing the class name of the tagged object.
114+
*/
57115
public String getObjectClass() {
58116
return objectClass;
59117
}
60118

119+
/**
120+
* Sets the fully qualified class name of the object that this TagObject represents.
121+
*
122+
* @param objectClass A {@link String} containing the fully qualified class name of the object.
123+
*/
61124
public void setObjectClass(String objectClass) {
62125
this.objectClass = objectClass;
63126
}

src/main/webapp/PMmodule/Admin/ProgramView/queue.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
}
122122
123123
function cme_client(programId, clientId) {
124-
popup("caseManagement" + clientId, "../oscarEncounter/IncomingEncounter.do?case_program_id=" + programId + "&demographicNo=" + clientId + "&status=B");
124+
popup("caseManagement" + clientId, "<%=request.getContextPath()%>/oscarEncounter/IncomingEncounter.do?case_program_id=" + programId + "&demographicNo=" + clientId + "&status=B");
125125
}
126126
127127
@@ -299,7 +299,7 @@
299299
String url = request.getContextPath() + "/eform/efmshowform_data.jsp?fdid= " + curform.get("fdid") + "&appointment=" + demographic_no;
300300
if (ppd.isThisProgramInProgramDomain(curUser_no, Integer.valueOf(programId))) {
301301
302-
String eURL = "../oscarEncounter/IncomingEncounter.do?programId=" + programId + "&providerNo=" + curUser_no + "&appointmentNo=" + rsAppointNO + "&demographicNo=" + demographic_no + "&curProviderNo=" + curUser_no + "&reason=" + java.net.URLEncoder.encode(reason) + "&encType=" + java.net.URLEncoder.encode("face to face encounter with client", "UTF-8") + "&userName=" + java.net.URLEncoder.encode(userfirstname + " " + userlastname) + "&curDate=null&appointmentDate=null&startTime=0:0" + "&status=" + status + "&source=cm";
302+
String eURL = request.getContextPath() + "/oscarEncounter/IncomingEncounter.do?programId=" + programId + "&providerNo=" + curUser_no + "&appointmentNo=" + rsAppointNO + "&demographicNo=" + demographic_no + "&curProviderNo=" + curUser_no + "&reason=" + java.net.URLEncoder.encode(reason) + "&encType=" + java.net.URLEncoder.encode("face to face encounter with client", "UTF-8") + "&userName=" + java.net.URLEncoder.encode(userfirstname + " " + userlastname) + "&curDate=null&appointmentDate=null&startTime=0:0" + "&status=" + status + "&source=cm";
303303
%>
304304
<a href=#
305305
onClick="popupPage(710, 1024,'<%=eURL%>');return false;"

src/main/webapp/admin/admin.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@
811811

812812
<li>&nbsp;<a href="#" onclick='popupPage(500,800, "${pageContext.request.contextPath}/admin/api/clients.jsp");return false;'>REST Clients</a></li>
813813
<li><a href="#"
814-
onclick="popupPage(900, 500, '../setProviderStaleDate.do?method=viewIntegratorProperties');return false;"><fmt:setBundle basename="oscarResources"/><fmt:message key="provider.btnSetIntegratorPreferences"/></a></li>
814+
onclick="popupPage(900, 500, '<%=request.getContextPath()%>/setProviderStaleDate.do?method=viewIntegratorProperties');return false;"><fmt:setBundle basename="oscarResources"/><fmt:message key="provider.btnSetIntegratorPreferences"/></a></li>
815815
<li><a href="#"
816816
onClick="popupPage(800, 1000, '../admin/integratorPushStatus.jsp');return false;"><fmt:setBundle basename="oscarResources"/><fmt:message key="admin.admin.integratorPush"/></a></li>
817817

src/main/webapp/admin/billingreferralAdmin.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
}
7979
8080
function openEditSpecialist(specId) {
81-
popupOscarRx(625, 1024, '../oscarEncounter/EditSpecialists.do?specId=' + specId);
81+
popupOscarRx(625, 1024, '<%=request.getContextPath()%>/oscarEncounter/EditSpecialists.do?specId=' + specId);
8282
}
8383
8484
function checkUncheck(referralId) {

src/main/webapp/appointment/editappointment.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,10 +1329,10 @@
13291329
width="13">
13301330
</a>
13311331
<a class="btn"
1332-
onClick="window.location='appointmentcontrol.jsp?displaymode=PrintCard&appointment_no=<%=appointment_no%>'">
1332+
onClick="window.location='appointmentcontrol.jsp?displaymode=PrintCard&appointment_no=' + encodeURIComponent('<%=appointment_no%>')">
13331333
<i class="icon-print"></i>&nbsp;<fmt:setBundle basename="oscarResources"/><fmt:message key="appointment.editappointment.btnPrintCard"/></a>
13341334
<a class="btn"
1335-
onClick="window.open('<%=request.getContextPath() %>/demographic/demographiclabelprintsetting.jsp?demographic_no='+document.EDITAPPT.demographic_no.value, 'labelprint','height=550,width=700,location=no,scrollbars=yes,menubars=no,toolbars=no' )">
1335+
onClick="window.open('<%=request.getContextPath() %>/demographic/demographiclabelprintsetting.jsp?demographic_no=' + encodeURIComponent(document.EDITAPPT.demographic_no.value), 'labelprint','height=550,width=700,location=no,scrollbars=yes,menubars=no,toolbars=no')">
13361336
<i class="icon-print"></i>&nbsp;<fmt:setBundle basename="oscarResources"/><fmt:message key="appointment.editappointment.btnLabelPrint"/></a>
13371337
<a class="btn"
13381338
onclick="document.forms['EDITAPPT'].displaymode.value='Cut';localStorage.setItem('copyPaste','1');document.forms['EDITAPPT'].submit();">

src/main/webapp/billing/CA/BC/adjustBill.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@
539539

540540
<%if (BillType.equals("A") || BillType.equals("P")) {%>
541541
<a href="#"
542-
onClick="popupPage(800,800, '../../../billing/CA/BC/billingView.do?billing_no=<%=request.getAttribute("invoiceNo")%>&receipt=yes')">View
542+
onClick="popupPage(800,800, '<%=request.getContextPath()%>/billing/CA/BC/billingView.do?billing_no=<%=request.getAttribute("invoiceNo")%>&receipt=yes')">View
543543
Invoice</a>
544544
<%}%>
545545
</td>

src/main/webapp/billing/CA/BC/billStatus.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@
554554
</td>
555555
<td>
556556
<%if ("Pri".equals(b.billingtype)) {%>
557-
<a href="javascript:popupPage(800,800, '../../../billing/CA/BC/billingView.do?billing_no=<%=b.billing_no%>&receipt=yes')"><%=b.billing_no%>
557+
<a href="javascript:popupPage(800,800, '<%=request.getContextPath()%>/billing/CA/BC/billingView.do?billing_no=<%=b.billing_no%>&receipt=yes')"><%=b.billing_no%>
558558
</a>
559559
<%
560560
} else {

src/main/webapp/billing/CA/ON/billingEditWithApptNo.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
rs2 = dao.getActiveBillingItemByCh1Id(ConversionUtils.fromIntString(billNo));
154154
}
155155
156-
String action_str = "../../../billing.do?billRegion=" + URLEncoder.encode(prov) + "&billForm=" + URLEncoder.encode(billForm) + "&hotclick=" + URLEncoder.encode(hotclick) + "&appointment_no=" + appointment_no + "&demographic_name=" + URLEncoder.encode(name) + "&status=" + status + "&demographic_no=" + demographic_no + "&providerview=" + providerview + "&user_no=" + curUser_no + "&apptProvider_no=" + apptProvider_no + "&appointment_date=" + appointment_date + "&start_time=" + start_time + "&bNewForm=1";
156+
String action_str = request.getContextPath() + "/billing.do?billRegion=" + URLEncoder.encode(prov) + "&billForm=" + URLEncoder.encode(billForm) + "&hotclick=" + URLEncoder.encode(hotclick) + "&appointment_no=" + appointment_no + "&demographic_name=" + URLEncoder.encode(name) + "&status=" + status + "&demographic_no=" + demographic_no + "&providerview=" + providerview + "&user_no=" + curUser_no + "&apptProvider_no=" + apptProvider_no + "&appointment_date=" + appointment_date + "&start_time=" + start_time + "&bNewForm=1";
157157
158158
if (status.substring(0, 1).compareTo("B") == 0) {
159159
%>

src/main/webapp/billing/CA/ON/billingONNewReport.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
nNo++;
224224
sAmountclaim = rs.getString("amountclaim");
225225
sAmountpay = rs.getString("amountpay");
226-
String strT = "<a href=# onClick='popupPage(700,720, \"../../../billing/CA/BC/billingView.do?billing_no="
226+
String strT = "<a href=# onClick='popupPage(700,720, \"" + request.getContextPath() + "/billing/CA/BC/billingView.do?billing_no="
227227
+ rs.getString("billing_no") + "&dboperation=search_bill&hotclick=0\"); return false;' >"
228228
+ rs.getString("billing_no") + "</a>";
229229
prop.setProperty("No", "" + nNo);
@@ -247,7 +247,7 @@
247247
fAmountpay = fAmountpay + Float.parseFloat(rs.getString("amountpay"));
248248
sAmountpay = "" + Math.round(fAmountpay * 100) / 100.00;
249249
//hin = rs.getString("hin");
250-
String strT = "<a href=# onClick='popupPage(700,720, \"../../../billing/CA/BC/billingView.do?billing_no="
250+
String strT = "<a href=# onClick='popupPage(700,720, \"" + request.getContextPath() + "/billing/CA/BC/billingView.do?billing_no="
251251
+ rs.getString("billing_no") + "&dboperation=search_bill&hotclick=0\"); return false;' >"
252252
+ rs.getString("billing_no") + "</a>";
253253
prop.setProperty("No", "" + nNo);
@@ -319,7 +319,7 @@
319319
else if (reason.compareTo("B") == 0) reason = "Sent OHIP";
320320
321321
prop.setProperty("Description", reason + "(" + note + ")");
322-
String tempStr = "<a href=# onClick='popupPage(700,720, \"../../../billing/CA/BC/billingView.do?billing_no="
322+
String tempStr = "<a href=# onClick='popupPage(700,720, \""+ request.getContextPath() + "/billing/CA/BC/billingView.do?billing_no="
323323
+ rs.getString("billing_no") + "&dboperation=search_bill&hotclick=0\"); return false;' title='"
324324
+ reason + "'>" + rs.getString("billing_no") + "</a>";
325325
prop.setProperty("Billing No", tempStr);

0 commit comments

Comments
 (0)