lets put OCEAN where the OSCAR instance has allowance
jQuery("#ocean_placeholder").show();
jQuery("#ocean_placeholder").append("
Sorry, the Ocean toolbar is currently unavailable.
");
diff --git a/src/main/webapp/js/custom/ocean/conreq.js b/src/main/webapp/js/custom/ocean/conreq.js
index 2d1ef4f9f48..e535ec3b386 100644
--- a/src/main/webapp/js/custom/ocean/conreq.js
+++ b/src/main/webapp/js/custom/ocean/conreq.js
@@ -90,4 +90,3 @@ function attachOceanAttachments() {
}
});
}
-
diff --git a/src/main/webapp/js/custom/westernu/ticklerMain.js b/src/main/webapp/js/custom/westernu/ticklerMain.js
index f9c11ac991f..71d6c4ba54d 100644
--- a/src/main/webapp/js/custom/westernu/ticklerMain.js
+++ b/src/main/webapp/js/custom/westernu/ticklerMain.js
@@ -1,4 +1,3 @@
jQuery(document).ready(function () {
jQuery("#checkAllLink").hide();
});
-
diff --git a/src/main/webapp/js/demographicProviderAutocomplete.js b/src/main/webapp/js/demographicProviderAutocomplete.js
index 6e8ecbb11f1..182e7414c86 100644
--- a/src/main/webapp/js/demographicProviderAutocomplete.js
+++ b/src/main/webapp/js/demographicProviderAutocomplete.js
@@ -8,18 +8,14 @@ var highlightMatch = function (full, snippet, matchindex) {
full.substring(matchindex + snippet.length);
};
var resultFormatter2 = function (oResultData, sQuery, sResultMatch) {
- //console.log(oResultData);
var query = sQuery.toLowerCase(),
fname = oResultData[0],
dob = oResultData[1],
status = oResultData[3],
fnameMatchIndex = fname.toLowerCase().indexOf(query),
displayfname = '';
- //oscarLog("in resultFormatter2");
- //oscarLog(oResultData);
if (fnameMatchIndex > -1) {
displayfname = highlightMatch(fname, query, fnameMatchIndex);
- //oscarLog("displayfname in if="+displayfname);
} else {
displayfname = fname;
}
@@ -28,7 +24,6 @@ var resultFormatter2 = function (oResultData, sQuery, sResultMatch) {
};
var resultFormatter = function (oResultData, sQuery, sResultMatch) {
- //console.log(oResultData);
var query = sQuery.toLowerCase(),
fname = oResultData[1],
lname = oResultData[2],
@@ -54,7 +49,6 @@ var resultFormatter = function (oResultData, sQuery, sResultMatch) {
};
var resultFormatter3 = function (oResultData, sQuery, sResultMatch) {
- //console.log(oResultData);
var query = sQuery.toLowerCase(),
fname = oResultData[1],
lname = oResultData[2],
@@ -98,4 +92,4 @@ function removeProv(th) {
var ele = th.up();
ele.remove();
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/js/documentDescriptionTypeahead.js b/src/main/webapp/js/documentDescriptionTypeahead.js
index d2450169d53..9602f7b0bba 100644
--- a/src/main/webapp/js/documentDescriptionTypeahead.js
+++ b/src/main/webapp/js/documentDescriptionTypeahead.js
@@ -9,7 +9,6 @@ var highlightMatch = function (full, snippet, matchIndex) {
};
var formatDocumentDescriptionResults = function (oResultData, sQuery, sResultMatch) {
- //console.log(oResultData);
var query = sQuery.toLowerCase(),
fname = oResultData[1],
lname = oResultData[2],
@@ -70,4 +69,4 @@ function checkDesc() {
break;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/js/dxJSONCodeSearch.js b/src/main/webapp/js/dxJSONCodeSearch.js
index 5e9fb07aedf..cc793251390 100644
--- a/src/main/webapp/js/dxJSONCodeSearch.js
+++ b/src/main/webapp/js/dxJSONCodeSearch.js
@@ -106,4 +106,3 @@ function bindDxJSONEvents() {
jQuery(document).ready(function () {
bindDxJSONEvents();
})
-
diff --git a/src/main/webapp/js/fg.menu.js b/src/main/webapp/js/fg.menu.js
index cf930411962..6c3bb1920bf 100644
--- a/src/main/webapp/js/fg.menu.js
+++ b/src/main/webapp/js/fg.menu.js
@@ -126,7 +126,6 @@ function Menu(caller, options) {
;
caller
.addClass('fg-menu-open');
- // .addClass(options.callerOnState);
container.parent().show().click(function () {
menu.kill();
return false;
diff --git a/src/main/webapp/js/formBCAR2020Record.js b/src/main/webapp/js/formBCAR2020Record.js
index aaea36cc0d9..16e4acfc828 100644
--- a/src/main/webapp/js/formBCAR2020Record.js
+++ b/src/main/webapp/js/formBCAR2020Record.js
@@ -703,7 +703,6 @@ function valDate(dateBox, ds = dtCh) {
try {
var dateString = dateBox.value;
if (dateString === "") {
- // alert('dateString'+dateString);
return true;
}
var dt = dateString.split(ds);
@@ -1223,11 +1222,3 @@ const wtEnglish2Metric = function (obj) {
}
}
}
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/js/genericIntake.js b/src/main/webapp/js/genericIntake.js
index ff72104aef1..cf99441da29 100644
--- a/src/main/webapp/js/genericIntake.js
+++ b/src/main/webapp/js/genericIntake.js
@@ -61,7 +61,6 @@ function validBedCommunityProgram() {
var programId = Number(programIdStr);
if (programIdStr == "") {
- //alert( "Bed program is mandatory");
return false;
} else {
return true;
@@ -85,8 +84,6 @@ function validateEdit() {
return true;
}
- //$("form").validate({meta: "validate"});
-
var programIdEl = getElement('bedCommunityProgramId');
var programId = 0;
if (programIdEl != null) {
diff --git a/src/main/webapp/js/global.js b/src/main/webapp/js/global.js
index d8da5cf9939..9f4fe693259 100755
--- a/src/main/webapp/js/global.js
+++ b/src/main/webapp/js/global.js
@@ -167,4 +167,4 @@ function selectSelectListOption(selectList, optionValue) {
function getSelectListValue(selectList) {
return (selectList.options[selectList.selectedIndex].value);
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/js/history.js b/src/main/webapp/js/history.js
index 7fee25c70d1..dce7535c5b8 100644
--- a/src/main/webapp/js/history.js
+++ b/src/main/webapp/js/history.js
@@ -720,7 +720,6 @@
}
if (!api) {
- //
document[_a](eventPrefix + "click", function (e) {
var
event = e || window.event,
@@ -902,4 +901,4 @@
History.pushState = pushState;
-})(window, true, false, null);
\ No newline at end of file
+})(window, true, false, null);
diff --git a/src/main/webapp/js/jqplot/plugins/jqplot.pieRenderer.js b/src/main/webapp/js/jqplot/plugins/jqplot.pieRenderer.js
index dc93a2a021b..45a09da36f7 100644
--- a/src/main/webapp/js/jqplot/plugins/jqplot.pieRenderer.js
+++ b/src/main/webapp/js/jqplot/plugins/jqplot.pieRenderer.js
@@ -408,7 +408,6 @@
//see http://stackoverflow.com/questions/20221461/hidpi-retina-plot-drawing
var cw = parseInt(ctx.canvas.style.width);
var ch = parseInt(ctx.canvas.style.height);
- //
var w = cw - offx - 2 * this.padding;
var h = ch - offy - 2 * this.padding;
@@ -525,7 +524,6 @@
// dummy objects with properties so the plot will render.
// called with scope of axis object.
$.jqplot.PieAxisRenderer.prototype.init = function (options) {
- //
this.tickRenderer = $.jqplot.PieTickRenderer;
$.extend(true, this, options);
// I don't think I'm going to need _dataBounds here.
@@ -916,5 +914,3 @@
$.jqplot.PieTickRenderer.prototype.constructor = $.jqplot.PieTickRenderer;
})(jQuery);
-
-
\ No newline at end of file
diff --git a/src/main/webapp/js/jquery-1.9.1.js b/src/main/webapp/js/jquery-1.9.1.js
index 88105eda92b..7dec3941a96 100644
--- a/src/main/webapp/js/jquery-1.9.1.js
+++ b/src/main/webapp/js/jquery-1.9.1.js
@@ -982,7 +982,7 @@
return object;
}
- /*
+/*
* Create a callback list using the following parameters:
*
* options: an optional list of space-separated options that will change how
@@ -2713,7 +2713,7 @@
return false;
}
- /*
+/*
* Helper functions for managing events -- not part of the public interface.
* Props to Dean Edwards' addEvent library for many of the ideas.
*/
@@ -3691,7 +3691,7 @@
}
}
});
- /*!
+/*!
* Sizzle CSS Selector Engine
* Copyright 2012 jQuery Foundation and other contributors
* Released under the MIT license
@@ -4578,7 +4578,7 @@
},
"CHILD": function (match) {
- /* matches from matchExpr["CHILD"]
+ /* matches from matchExpr["CHILD"]
1 type (only|nth|...)
2 what (child|of-type)
3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
@@ -7443,7 +7443,7 @@
// Keep a copy of the old load method
_load = jQuery.fn.load,
- /* Prefilters
+ /* Prefilters
* 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
* 2) These are called:
* - BEFORE asking for a transport
@@ -7454,7 +7454,7 @@
*/
prefilters = {},
- /* Transports bindings
+ /* Transports bindings
* 1) key is the dataType
* 2) the catchall symbol "*" can be used
* 3) selection will start with transport dataType and THEN go to "*" if needed
@@ -7655,17 +7655,6 @@
processData: true,
async: true,
contentType: "application/x-www-form-urlencoded; charset=UTF-8",
- /*
- timeout: 0,
- data: null,
- dataType: null,
- username: null,
- password: null,
- cache: null,
- throws: false,
- traditional: false,
- headers: {},
- */
accepts: {
"*": allTypes,
@@ -8126,7 +8115,7 @@
}
});
- /* Handles responses to an ajax request:
+/* Handles responses to an ajax request:
* - sets all responseXXX fields accordingly
* - finds the right dataType (mediates between content-type and expected dataType)
* - returns the corresponding response
@@ -8474,7 +8463,7 @@
// Create the request object
// (This is still attached to ajaxSettings for backward compatibility)
jQuery.ajaxSettings.xhr = window.ActiveXObject ?
- /* Microsoft failed to properly
+ /* Microsoft failed to properly
* implement the XMLHttpRequest in IE7 (can't request local files),
* so we use the ActiveXObject when it is available
* Additionally XMLHttpRequest can be disabled in IE7/IE8 so
diff --git a/src/main/webapp/js/jquery.autocomplete.js b/src/main/webapp/js/jquery.autocomplete.js
index c5b8804f083..69cadf4c918 100755
--- a/src/main/webapp/js/jquery.autocomplete.js
+++ b/src/main/webapp/js/jquery.autocomplete.js
@@ -228,7 +228,6 @@
});
words[wordAt] = v;
// TODO this should set the cursor to the right position, but it gets overriden somewhere
- //$.Autocompleter.Selection(input, progress + seperator, progress + seperator);
v = words.join(options.multipleSeparator);
}
v += options.multipleSeparator;
@@ -810,4 +809,4 @@
}
};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/src/main/webapp/js/jquery.fileDownload.js b/src/main/webapp/js/jquery.fileDownload.js
index a2b619a4614..f0c2b050fcc 100644
--- a/src/main/webapp/js/jquery.fileDownload.js
+++ b/src/main/webapp/js/jquery.fileDownload.js
@@ -12,7 +12,6 @@
var $ = jQuery.noConflict();
$.extend({
- //
//$.fileDownload('/path/to/url/', options)
// see directly below for possible 'options'
fileDownload: function (fileUrl, options) {
@@ -409,4 +408,3 @@ $.extend({
}
}
});
-
diff --git a/src/main/webapp/js/jquery.metadata.js b/src/main/webapp/js/jquery.metadata.js
index b83f5905a1d..dfd694ad554 100755
--- a/src/main/webapp/js/jquery.metadata.js
+++ b/src/main/webapp/js/jquery.metadata.js
@@ -119,4 +119,4 @@
return $.metadata.get(this[0], opts);
};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/src/main/webapp/js/jquery.treeview.js b/src/main/webapp/js/jquery.treeview.js
index 5a9bcc21991..57d821b5e11 100644
--- a/src/main/webapp/js/jquery.treeview.js
+++ b/src/main/webapp/js/jquery.treeview.js
@@ -256,4 +256,4 @@
hitarea: "hitarea"
});
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/src/main/webapp/js/jquery.validate.js b/src/main/webapp/js/jquery.validate.js
index 7d69ab376c4..3d9a2fc2adc 100644
--- a/src/main/webapp/js/jquery.validate.js
+++ b/src/main/webapp/js/jquery.validate.js
@@ -1236,4 +1236,4 @@
});
}
});
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/main/webapp/js/loading-bar.js b/src/main/webapp/js/loading-bar.js
index 6040f224b71..4c21d0b721f 100644
--- a/src/main/webapp/js/loading-bar.js
+++ b/src/main/webapp/js/loading-bar.js
@@ -306,6 +306,6 @@
};
- }]; //
+ }];
}); // wtf javascript. srsly
-})(); //
\ No newline at end of file
+})();
diff --git a/src/main/webapp/js/menuExpandable.js b/src/main/webapp/js/menuExpandable.js
index 73cfff5bcf9..4a53289f7e9 100755
--- a/src/main/webapp/js/menuExpandable.js
+++ b/src/main/webapp/js/menuExpandable.js
@@ -18,8 +18,6 @@ function initializeMenu(menuId, actuatorId) {
if (menu == null || actuator == null) return;
- //if (window.opera) return; // I'm too tired
-
actuator.parentNode.style.backgroundImage = "url(../images/plus.gif)";
//expand all nodes at init
diff --git a/src/main/webapp/js/messenger/messenger-theme-future.js b/src/main/webapp/js/messenger/messenger-theme-future.js
index dbbd1dee21f..55b7e7a9f24 100644
--- a/src/main/webapp/js/messenger/messenger-theme-future.js
+++ b/src/main/webapp/js/messenger/messenger-theme-future.js
@@ -43,4 +43,4 @@
Message: FutureMessage
};
-}).call(this);
\ No newline at end of file
+}).call(this);
diff --git a/src/main/webapp/js/oscar-alert.js b/src/main/webapp/js/oscar-alert.js
index 6a2615f8434..c06f210ff23 100644
--- a/src/main/webapp/js/oscar-alert.js
+++ b/src/main/webapp/js/oscar-alert.js
@@ -174,4 +174,3 @@ class OscarAlert {
return labels[this.alertType] || 'Unknown';
}
}
-
diff --git a/src/main/webapp/js/standard.js b/src/main/webapp/js/standard.js
index 28cc38fe928..d39d1a2b6fd 100755
--- a/src/main/webapp/js/standard.js
+++ b/src/main/webapp/js/standard.js
@@ -268,7 +268,6 @@ function xmlhttpPost(requestURL, changeFunc, queryString) {
// Mozilla/Safari
if (window.XMLHttpRequest) {
self.xmlHttpReq = new XMLHttpRequest();
- //self.xmlHttpReq.overrideMimeType("text/xml");
}
// IE
else if (window.ActiveXObject) {
diff --git a/src/main/webapp/js/wysihtml5-0.3.0.js b/src/main/webapp/js/wysihtml5-0.3.0.js
index 30f5e252e64..9d17d5a9e9b 100644
--- a/src/main/webapp/js/wysihtml5-0.3.0.js
+++ b/src/main/webapp/js/wysihtml5-0.3.0.js
@@ -365,11 +365,7 @@ rangy.createModule("DomUtil", function (api, module) {
// Removed use of indexOf because of a bizarre bug in Opera that is thrown in one of the Acid3 tests. I haven't been
// able to replicate it outside of the test. The bug is that indexOf returns -1 when called on an Array that
// contains just the document as a single element and the value searched for is the document.
- var arrayContains = /*Array.prototype.indexOf ?
- function(arr, val) {
- return arr.indexOf(val) > -1;
- }:*/
-
+ var arrayContains =
function (arr, val) {
var i = arr.length;
while (i--) {
@@ -775,7 +771,6 @@ rangy.createModule("DomRange", function (api, module) {
var it, n;
iteratorState = iteratorState || {stop: false};
for (var node, subRangeIterator; node = rangeIterator.next();) {
- //log.debug("iterateSubtree, partially selected: " + rangeIterator.isPartiallySelectedSubtree(), nodeToString(node));
if (rangeIterator.isPartiallySelectedSubtree()) {
// The node is partially selected by the Range, so we can use a new RangeIterator on the portion of the
// node selected by the Range.
@@ -839,7 +834,6 @@ rangy.createModule("DomRange", function (api, module) {
}
function getNodesInRange(range, nodeTypes, filter) {
- //log.info("getNodesInRange, " + nodeTypes.join(","));
var filterNodeTypes = !!(nodeTypes && nodeTypes.length), regex;
var filterExists = !!filter;
if (filterNodeTypes) {
@@ -2180,12 +2174,6 @@ rangy.createModule("WrappedRange", function (api, module) {
// present in 3.6.8) that throws "Index or size is negative or greater than the allowed amount" for
// insertNode in some circumstances, all browsers will have to use the Rangy's own implementation of
// insertNode, which works but is almost certainly slower than the native implementation.
- /*
- rangeProto.insertNode = function(node) {
- this.nativeRange.insertNode(node);
- updateRangeProperties(this);
- };
-*/
rangeProto.surroundContents = function (node) {
this.nativeRange.surroundContents(node);
@@ -2412,7 +2400,6 @@ rangy.createModule("WrappedRange", function (api, module) {
return tr;
- //return createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
} else {
var startRange = createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
var endRange = createBoundaryTextRange(new DomPosition(range.endContainer, range.endOffset), false);
@@ -3270,7 +3257,6 @@ Base.extend = function (_instance, _static) { // subclass
delete Base._prototyping;
// create the wrapper for the constructor function
- //var constructor = proto.constructor.valueOf(); //-dean
var constructor = proto.constructor;
var klass = proto.constructor = function () {
if (!Base._prototyping) {
@@ -3292,7 +3278,6 @@ Base.extend = function (_instance, _static) { // subclass
klass.prototype = proto;
klass.toString = this.toString;
klass.valueOf = function (type) {
- //return (type == "object") ? klass : constructor; //-dean
return (type == "object") ? klass : constructor.valueOf();
};
extend.call(klass, _static);
@@ -6349,7 +6334,6 @@ wysihtml5.quirks.cleanPastedHTML = (function () {
}
// Investigate the following in order to handle multi line selections
- // rangeBottom = rangeTop + (rangeHeight ? (rangeHeight - 1) : 0);
rangeBottom = rangeTop;
rangeEnd = this.doc.selection.createRange();
for (j = scrollWidth; j >= 0; j--) {
diff --git a/src/main/webapp/library/datetime-moment.js b/src/main/webapp/library/datetime-moment.js
index af3ab4911d9..772988d656f 100644
--- a/src/main/webapp/library/datetime-moment.js
+++ b/src/main/webapp/library/datetime-moment.js
@@ -71,4 +71,4 @@
};
};
-}));
\ No newline at end of file
+}));
diff --git a/src/main/webapp/library/eforms/APCache.js b/src/main/webapp/library/eforms/APCache.js
index 9b0ccf9d3ef..dd8a6a5d568 100644
--- a/src/main/webapp/library/eforms/APCache.js
+++ b/src/main/webapp/library/eforms/APCache.js
@@ -312,4 +312,4 @@ function CacheMapping(options) {
this.onCacheResponse = options.cacheResponseHandler == null ? function () {
} : options.cacheResponseHandler;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/library/eforms/SignHere.js b/src/main/webapp/library/eforms/SignHere.js
index 7d1463c7856..f8a6e4acf7e 100644
--- a/src/main/webapp/library/eforms/SignHere.js
+++ b/src/main/webapp/library/eforms/SignHere.js
@@ -111,12 +111,6 @@
// //Because plugins are minified together with jSignature, multiple defines per (minified) file blow up and dont make sense
// //Need to revisit this later.
-// if ( typeof define === "function" && define.amd != null) {
-// // AMD-loader compatible resource declaration
-// // you need to call this one with jQuery as argument.
-// define(function(){return Initializer} )
-// } else {
ExtensionAttacher()
-// }
-})();
\ No newline at end of file
+})();
diff --git a/src/main/webapp/library/eforms/editControl.js b/src/main/webapp/library/eforms/editControl.js
index d369373f108..17fe1f20dfd 100644
--- a/src/main/webapp/library/eforms/editControl.js
+++ b/src/main/webapp/library/eforms/editControl.js
@@ -639,4 +639,4 @@ jQuery(document).ready(function () {
if (jQuery.fn.convertImagePaths === undefined) {
addJavascript("../share/javascript/eforms/imageControl.js", "head");
}
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/library/eforms/imageControl.js b/src/main/webapp/library/eforms/imageControl.js
index bf297584571..e28f043711b 100644
--- a/src/main/webapp/library/eforms/imageControl.js
+++ b/src/main/webapp/library/eforms/imageControl.js
@@ -34,4 +34,4 @@
});
return valNode.html();
};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/src/main/webapp/library/eforms/jsgraphics.js b/src/main/webapp/library/eforms/jsgraphics.js
index c8c8a4c8876..4c094991684 100644
--- a/src/main/webapp/library/eforms/jsgraphics.js
+++ b/src/main/webapp/library/eforms/jsgraphics.js
@@ -931,4 +931,3 @@ function _mkLinVirt(aLin, x1, y1, x2, y2) {
function _CompInt(x, y) {
return (x - y);
}
-
diff --git a/src/main/webapp/library/markdown.js b/src/main/webapp/library/markdown.js
index 9b48a696f38..5aa1d1163c1 100644
--- a/src/main/webapp/library/markdown.js
+++ b/src/main/webapp/library/markdown.js
@@ -31,4 +31,4 @@ angular.module('btford.markdown', ['ngSanitize']).provider('markdownConverter',
}
}
};
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/library/oscar-modal-dialog.js b/src/main/webapp/library/oscar-modal-dialog.js
index e05da335557..8af7870c7cd 100644
--- a/src/main/webapp/library/oscar-modal-dialog.js
+++ b/src/main/webapp/library/oscar-modal-dialog.js
@@ -39,15 +39,6 @@ jQuery(document).ready(function () {
width: 'auto',
height: 'auto',
resizable: true
- /* ,
- show: {
- effect: "blind",
- duration: 1000
- },
- hide: {
- effect: "explode",
- duration: 1000
- } */
});
jQuery(".oscar-dialog-link").on("click", function (event) {
@@ -56,4 +47,4 @@ jQuery(document).ready(function () {
jQuery("#oscar-dialog").load(url).dialog('open');
});
});
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/library/typeahead.js/typeahead.js b/src/main/webapp/library/typeahead.js/typeahead.js
index 57a9d5d2e0f..530f38e9923 100644
--- a/src/main/webapp/library/typeahead.js/typeahead.js
+++ b/src/main/webapp/library/typeahead.js/typeahead.js
@@ -1185,4 +1185,4 @@
}
};
})();
-})(window.jQuery);
\ No newline at end of file
+})(window.jQuery);
diff --git a/src/main/webapp/oscar.js b/src/main/webapp/oscar.js
index 617e3c4cc34..656bcb22e1a 100755
--- a/src/main/webapp/oscar.js
+++ b/src/main/webapp/oscar.js
@@ -36,4 +36,4 @@ function ycenter(height) {
function popup(page, width, height) {
window.open(page, '', "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no,width=" + width + ", height=" + height + ", left=" + xcenter(width) + ", top=" + ycenter(height));
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/oscarEncounter/calculators/riskcalc/js/js.js b/src/main/webapp/oscarEncounter/calculators/riskcalc/js/js.js
index f96d9591c4c07e5ed6af666fa241e4cdc92fb947..accea8c2e4dbaec7cbd8e79fa720956206b9367d 100755
GIT binary patch
delta 58
zcmZ3yoB2Q=^M?8Sn>Pyig-`x>mVfew3bxID`4*g$H#SRd=Brt5vHAVZSPq!fWWW5_
J&6+35MFAf<8qxp&
delta 1590
zcmd^8&rcIU6c!KzjesJ*G$=1sBbL(bQVIlGw82C$7-IZE)DWC)r|gE^ow~EzhD1X=
z=#dzn2QQ$;i_vHd^(Ik|UPR6w{0BVfmBa*Rw^YSoL%h0&o!Oc9zW4U~zV~jf;_>T>
zmk;V@K|E4mh?!YxajMS*!Qo;D2AKhsWGPT?YX-3?2c2>b8H*-0PQg}*3Cyv8<;);(
zC#eGAK!9uJlup5*ggX{BsA&UB!?2Rrk%XK|Eebj6bBlW5&Mc=XktM
iXs|^B=O2ofDEySL2YVn#DHeP1)_*@5y&w|Pk};#i680w*>n(ynSzz2Xi&U*
zieJ562V7;&cp)i8la}aM^kOrRLvnX_P%Pozh?gD-$ud}!XK2#avVtTCNInlj3V2JF
zSddgxlS&lgg>;;#J$xWBI<)z^$GaA=NNO7JMeT`lS;lX*@#f881(dF6xD<*kQVS^Y
z%4kULb%7G)0V%&&H#S}_1@O_$#%47#c+pivFi8cGdeYH}%`E)<3OYv8FyjiS=!~UY
zUAe0mO*fmt6kkkM1m{3!kO;aVsECfY`6vA
zYtOxyc7CN!$v_AAkH#crFbJad`sqVB#%oZWZ^hN~HMpoA!#&g2Hsa&Bez(az-@Rqh
zol9-*Wn1wwCh6K>Omg%=|A0rLYpsBU=a!rDYw1KazByC1%RLi>tY%wVwqheDsS&*8
zv<(#*v52iP&yLI{x=@x0>kHe7y#&LjMt_|!-Q!ERB_~FLOjA6$)QJP?*!*NAt}ImJ
zr=`odo~y?`Yd_x88cGm$9G_W+mm^5q>((qqo6o-~A|_>iCt!nwkJ*FxJsrk5r#^o_
zqx6;i-=@faeWF%vV>0^x-3Rz(suL5}Z+JQ`s8Rf&8YoTFV(DRdTC~fyq~GaEFUGK4
pjLn3H-p-3-<168u!tD5t{NbFx4iK)T)3}_8=XWjjH&*z3z8}g#9;E;P
diff --git a/src/main/webapp/oscarEncounter/javascript/sizing.js b/src/main/webapp/oscarEncounter/javascript/sizing.js
index 2c2b8007626..0e58ea5cefa 100755
--- a/src/main/webapp/oscarEncounter/javascript/sizing.js
+++ b/src/main/webapp/oscarEncounter/javascript/sizing.js
@@ -52,7 +52,7 @@ function num(value) {
var theString = new String(value);
var st = new String(theString.substring(0, theString.length - 2));
var numberSt = new Number(st);
- //alert('value: '+numberSt.toString());
+
return numberSt;
}
@@ -123,7 +123,7 @@ function shrinkTable(textarea) {
textarea.style.height = (ht - dheight);
else
textarea.style.height = lht;
- // this changes sh and fh size
+ // This changes sh and fh size
var shHeight = num(document.encForm.shTextarea.style.height);
var fhHeight = num(document.encForm.fhTextarea.style.height);
if (((shHeight - dheight / 2) > sht) && ((fhHeight - dheight / 2) > sht)) {
@@ -319,12 +319,4 @@ function hotkeySize(name, evnt) {
expandTable(name);
if (evnt.which == 45)
shrinkTable(name);
-
- /*alert('You have depressed a key');
- alert('event.which: '+evnt.which);
- alert('Event: '+evnt.modifiers);
- //alert('event.C_M: '+event.modifiers);
- if(evnt.modifiers == evnt.CONTROL_MASK)
- alert('you pressed Ctrl');
- */
}
diff --git a/src/main/webapp/phr/phr.js b/src/main/webapp/phr/phr.js
index 590b085735a..5cfe6d9808c 100755
--- a/src/main/webapp/phr/phr.js
+++ b/src/main/webapp/phr/phr.js
@@ -15,12 +15,10 @@ function phrActionPopup(url, windowName) {
}
}
popup.focus();
- //return false;
}
//myoscar exchange script:
function phrExchangeGo(url) {
- //alert("executing");
new Ajax.Request(url, {method: 'get'});
}
@@ -44,4 +42,4 @@ function popup2(height, width, top, left, url, windowName) {
}
popup.focus();
return false;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/calendar/lang/calendar-cs-win.js b/src/main/webapp/share/calendar/lang/calendar-cs-win.js
index 4ba9ffe7cef..9cbce91a515 100755
--- a/src/main/webapp/share/calendar/lang/calendar-cs-win.js
+++ b/src/main/webapp/share/calendar/lang/calendar-cs-win.js
@@ -67,4 +67,3 @@ Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
Calendar._TT["WK"] = "wk";
Calendar._TT["TIME"] = "�as:";
-
diff --git a/src/main/webapp/share/documentUploader/jquery.fileupload-ui.js b/src/main/webapp/share/documentUploader/jquery.fileupload-ui.js
index fd96e215844..fcfd54a12a3 100644
--- a/src/main/webapp/share/documentUploader/jquery.fileupload-ui.js
+++ b/src/main/webapp/share/documentUploader/jquery.fileupload-ui.js
@@ -640,4 +640,4 @@
});
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/main/webapp/share/documentUploader/jquery.fileupload-uix.js b/src/main/webapp/share/documentUploader/jquery.fileupload-uix.js
index 88b416c3635..c87aed45049 100644
--- a/src/main/webapp/share/documentUploader/jquery.fileupload-uix.js
+++ b/src/main/webapp/share/documentUploader/jquery.fileupload-uix.js
@@ -366,4 +366,4 @@
}
};
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/main/webapp/share/documentUploader/jquery.fileupload.js b/src/main/webapp/share/documentUploader/jquery.fileupload.js
index ff3f50dfdab..7ef87eeda71 100644
--- a/src/main/webapp/share/documentUploader/jquery.fileupload.js
+++ b/src/main/webapp/share/documentUploader/jquery.fileupload.js
@@ -717,4 +717,4 @@
});
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/main/webapp/share/documentUploader/jquery.iframe-transport.js b/src/main/webapp/share/documentUploader/jquery.iframe-transport.js
index 47e288be29f..8084f0f5323 100644
--- a/src/main/webapp/share/documentUploader/jquery.iframe-transport.js
+++ b/src/main/webapp/share/documentUploader/jquery.iframe-transport.js
@@ -153,4 +153,4 @@
}
});
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/src/main/webapp/share/javascript/Oscar.js b/src/main/webapp/share/javascript/Oscar.js
index 62301df485b..a37f8d35fe8 100755
--- a/src/main/webapp/share/javascript/Oscar.js
+++ b/src/main/webapp/share/javascript/Oscar.js
@@ -117,7 +117,6 @@ function validDateText(completeRawDate) {
year = (dateArray[0] - 0);
month = (dateArray[1] - 1);
day = (dateArray[2] - 0);
- //alert("year: " + year + ", " + month + ", " + day);
dateObject = new Date(year, month, day);
return ((day == dateObject.getDate()) && (month == dateObject.getMonth()) && (year == dateObject.getFullYear()));
}
@@ -216,4 +215,4 @@ function trim(str) {
str = str.replace(/^\s+/g, "");
str = str.replace(/\s+$/g, "");//trim str
return str;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/TabletSignature.js b/src/main/webapp/share/javascript/TabletSignature.js
index b12ff87c805..2678cc90682 100644
--- a/src/main/webapp/share/javascript/TabletSignature.js
+++ b/src/main/webapp/share/javascript/TabletSignature.js
@@ -341,4 +341,4 @@ function OnSignEvent(save, dirty, savedId) {
}
}
-window.addEventListener("load", loaded, true);
\ No newline at end of file
+window.addEventListener("load", loaded, true);
diff --git a/src/main/webapp/share/javascript/boxover.js b/src/main/webapp/share/javascript/boxover.js
index d0d86e6ace3..0703484fc7d 100644
--- a/src/main/webapp/share/javascript/boxover.js
+++ b/src/main/webapp/share/javascript/boxover.js
@@ -186,7 +186,6 @@ function SHW() {
var ID = null;
function moveMouse(e) {
- //boxMove=true;
e ? evt = e : evt = event;
CSE = evt.target ? evt.target : evt.srcElement;
@@ -371,4 +370,4 @@ function hideSelects() {
for (i = 0; i < elements.length; i++) {
elements[i].style.visibility = 'hidden';
}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/controls.js b/src/main/webapp/share/javascript/controls.js
index 363ec277d10..5567b6cad29 100755
--- a/src/main/webapp/share/javascript/controls.js
+++ b/src/main/webapp/share/javascript/controls.js
@@ -438,18 +438,12 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
}
while (foundPos != -1) {
if (foundPos == 0 && elem.length != entry.length) {
- /*ret.push("" + elem.substr(0, entry.length) + "" +
- elem.substr(entry.length) + ""); */
-
ret.push("" + elem.substr(0, entry.length) +
elem.substr(entry.length) + "");
break;
} else if (entry.length >= instance.options.partialChars &&
instance.options.partialSearch && foundPos != -1) {
if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos - 1, 1))) {
- /*partial.push("" + elem.substr(0, foundPos) + "" +
- elem.substr(foundPos, entry.length) + "" + elem.substr(
- foundPos + entry.length) + ""); */
partial.push("" + elem.substr(0, foundPos) + "" +
elem.substr(foundPos, entry.length) + "" + elem.substr(
diff --git a/src/main/webapp/share/javascript/effects.js b/src/main/webapp/share/javascript/effects.js
index 1ef0af456bb..23c821e6af3 100755
--- a/src/main/webapp/share/javascript/effects.js
+++ b/src/main/webapp/share/javascript/effects.js
@@ -1184,4 +1184,4 @@ Element.Methods.visualEffect = function (element, effect, options) {
return $(element);
};
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
diff --git a/src/main/webapp/share/javascript/fileprogress.js b/src/main/webapp/share/javascript/fileprogress.js
index d01558621dd..a12456f8b93 100755
--- a/src/main/webapp/share/javascript/fileprogress.js
+++ b/src/main/webapp/share/javascript/fileprogress.js
@@ -149,4 +149,4 @@ FileProgress.prototype.disappear = function () {
} else {
this.fileProgressWrapper.style.display = "none";
}
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/share/javascript/forms/forms-timed-autosave.js b/src/main/webapp/share/javascript/forms/forms-timed-autosave.js
index c9ffa16737b..1a28f3e4741 100644
--- a/src/main/webapp/share/javascript/forms/forms-timed-autosave.js
+++ b/src/main/webapp/share/javascript/forms/forms-timed-autosave.js
@@ -100,4 +100,4 @@ class FormsTimedAutosave {
setChangedFalse() {
this.changed = false;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/handlers.js b/src/main/webapp/share/javascript/handlers.js
index 2ce8e666e9f..782ebdcb58d 100755
--- a/src/main/webapp/share/javascript/handlers.js
+++ b/src/main/webapp/share/javascript/handlers.js
@@ -89,7 +89,6 @@ function uploadStart(file) {
}
function uploadProgress(file, bytesLoaded, bytesTotal) {
- //console.log("INHERE");
try {
var percent = Math.ceil((bytesLoaded / bytesTotal) * 100);
@@ -97,7 +96,6 @@ function uploadProgress(file, bytesLoaded, bytesTotal) {
progress.setProgress(percent);
progress.setStatus("Uploading...");
} catch (ex) {
- //console.log("aND IN HERE");
this.debug(ex);
}
}
diff --git a/src/main/webapp/share/javascript/menutility.js b/src/main/webapp/share/javascript/menutility.js
index d6183218f69..8b11ee8c310 100755
--- a/src/main/webapp/share/javascript/menutility.js
+++ b/src/main/webapp/share/javascript/menutility.js
@@ -50,5 +50,3 @@ function moveObject(objectId, newXCoordinate, newYCoordinate) {
return false;
}
} // moveObject
-
-
diff --git a/src/main/webapp/share/javascript/mouseover.js b/src/main/webapp/share/javascript/mouseover.js
index 9c764362cca..a4341a65a52 100755
--- a/src/main/webapp/share/javascript/mouseover.js
+++ b/src/main/webapp/share/javascript/mouseover.js
@@ -40,4 +40,4 @@ function handlerMM(e) {
document.captureEvents(Event.MOUSEMOVE);
-document.onmousemove = handlerMM;
\ No newline at end of file
+document.onmousemove = handlerMM;
diff --git a/src/main/webapp/share/javascript/nifty.js b/src/main/webapp/share/javascript/nifty.js
index a0da3496abf..e496cd5a2fc 100755
--- a/src/main/webapp/share/javascript/nifty.js
+++ b/src/main/webapp/share/javascript/nifty.js
@@ -217,4 +217,4 @@ function Mix(c1, c2) {
r[i] = Math.floor((x * 50 + y * 50) / 100);
}
return ("#" + r[0].toString(16) + r[1].toString(16) + r[2].toString(16));
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/oscarMDSIndex.js b/src/main/webapp/share/javascript/oscarMDSIndex.js
index 501cbd736f3..565d218f6e8 100644
--- a/src/main/webapp/share/javascript/oscarMDSIndex.js
+++ b/src/main/webapp/share/javascript/oscarMDSIndex.js
@@ -310,34 +310,6 @@ function sendMRP(ele) {
}
}
-/*
-function forwardDocument(docId) {
- var frm = "#reassignForm_" + docId;
- var query = jQuery(frm).serialize();
- alert(docId);
- jQuery.ajax({
- type: "POST",
- url: contextpath + "/oscarMDS/ReportReassign.do",
- data: query,
- success: function (data) {
- frm = "#frmDocumentDisplay_" + docId;
- query = jQuery(frm).serialize();
- jQuery.ajax({
- type: "POST",
- url: contextpath + "/documentManager/showDocument.jsp",
- data: query,
- success: function(data) {
- jQuery("#document_"+docId).html(data);
- }
- });
- },
- error: function(jqXHR, err, exception) {
- alert(jqXHR.status);
- }
- });
-}
-*/
-
function rotate180(id) {
jQuery("#rotate180btn_" + id).attr('disabled', 'disabled');
var displayDocumentAs = $('displayDocumentAs_' + id).value;
@@ -846,84 +818,6 @@ function checkBox() {
}
window.location.search = replaceQueryString(window.location.search, "view", view);
- /*
- //oscarLog("in checkBox");
- var checkedArray=new Array();
- if($('documentCB').checked==1){
- checkedArray.push('document');
- }
- if($('hl7CB').checked==1){
- checkedArray.push('hl7');
- }
- if($('normalCB').checked==1){
- checkedArray.push('normal');
- }
- if($('abnormalCB').checked==1){
- checkedArray.push('abnormal');
- }
- if($('unassignedCB').checked==1){
- checkedArray.push('unassigned');
- }
- if(checkedArray.length==0||checkedArray.length==4){
- var endindex= number_of_row_per_page-1;
- if(endindex>=total_rows.length)
- endindex=total_rows.length-1;
-
- //show all
- for(var i=0;i");
- //$("#picker img").mouseover(function() {
- // this.style.height = "400px";
- //}).mouseout(function() {
- // this.style.height = "";
- //});
$("#picker div").append(function (index, html) {
return "" + ++index + "" +
@@ -142,8 +119,6 @@ $(document).ready(function () {
"-moz-box-shadow: none' src='../images/icons/114.png' />";
});
- //$("#picker div span.rotate_r").click(function() { _rotater(this) });
-
$(document).bind("contextmenu", function (e) {
return false;
});
@@ -153,7 +128,6 @@ $(document).ready(function () {
});
_resizeui();
- //_resetsortable();
$("#picker div").click(function (e) {
$(this).addClass("selected");
@@ -176,32 +150,6 @@ $(document).ready(function () {
_zoom(this);
});
-
- /*$("#builder").sortable({
- helper: 'clone',
- revert: 'invalid',
- receive: function(e, ui) {
- $("#builder").children('div').wrap("");
- resizeUl();
- },
- start: function(e, ui) {
- if (ui.offset) {
- ui.originalPosition.left = 0;
- ui.offset.left = 0;
- ui.position.left = 0;
- }
- },
- sort: function(e, ui) {
- var curposition = $(ui.helper).position;
- temp = ui;
- ui.offset.left = 20;
- ui.position.left = -80;
- $(ui.helper).css('left', curposition-800);
- }
- }).droppable({
- activeClass: 'accept-drop'
- });*/
-
$("#tool_add").click(function (e) {
if ($(selected).length > 0) {
var selectedp = $(selected).parent();
@@ -296,4 +244,4 @@ $(document).ready(function () {
});
});
-$(window).load(resizeUl);
\ No newline at end of file
+$(window).load(resizeUl);
diff --git a/src/main/webapp/share/javascript/txtCounter/x_core.js b/src/main/webapp/share/javascript/txtCounter/x_core.js
index 0299c27527a..a56abf7267e 100755
--- a/src/main/webapp/share/javascript/txtCounter/x_core.js
+++ b/src/main/webapp/share/javascript/txtCounter/x_core.js
@@ -324,4 +324,4 @@ function xZIndex(e, uZ) {
uZ = parseInt(e.style.zIndex);
}
return uZ;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/txtCounter/x_dom.js b/src/main/webapp/share/javascript/txtCounter/x_dom.js
index c480ba51b29..abf6b21d72e 100755
--- a/src/main/webapp/share/javascript/txtCounter/x_dom.js
+++ b/src/main/webapp/share/javascript/txtCounter/x_dom.js
@@ -124,4 +124,4 @@ function xWalkTree(n, f) {
for (var c = n.firstChild; c; c = c.nextSibling) {
if (c.nodeType == 1) xWalkTree(c, f);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/txtCounter/x_event.js b/src/main/webapp/share/javascript/txtCounter/x_event.js
index 2a0d3c10db2..802e5ecf927 100755
--- a/src/main/webapp/share/javascript/txtCounter/x_event.js
+++ b/src/main/webapp/share/javascript/txtCounter/x_event.js
@@ -101,4 +101,4 @@ function xRemoveEventListener(e, eT, eL, cap) {
function xStopPropagation(evt) {
if (evt && evt.stopPropagation) evt.stopPropagation(); else if (window.event) window.event.cancelBubble = true;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/txtCounter/y_TextCounter.js b/src/main/webapp/share/javascript/txtCounter/y_TextCounter.js
index a850f4fc407..c24328b06ee 100755
--- a/src/main/webapp/share/javascript/txtCounter/y_TextCounter.js
+++ b/src/main/webapp/share/javascript/txtCounter/y_TextCounter.js
@@ -152,4 +152,4 @@ ylib.widget.TextCounter.prototype.prevent = function (event) {
return false;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/javascript/txtCounter/y_util.js b/src/main/webapp/share/javascript/txtCounter/y_util.js
index d250f4023b4..55dedd15648 100755
--- a/src/main/webapp/share/javascript/txtCounter/y_util.js
+++ b/src/main/webapp/share/javascript/txtCounter/y_util.js
@@ -38,4 +38,4 @@ ylib.util.FindValueInList = function (sValue, sList) {
if (tValue == sValue) return true;
}
return false;
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/share/lightwindow/javascript/lightwindow.js b/src/main/webapp/share/lightwindow/javascript/lightwindow.js
index ffffbe8f962..a7cc7d30bf6 100755
--- a/src/main/webapp/share/lightwindow/javascript/lightwindow.js
+++ b/src/main/webapp/share/lightwindow/javascript/lightwindow.js
@@ -2118,4 +2118,4 @@ var myLightWindow = null;
function lightwindowInit() {
//oscarLog("in lightwindowInit");
myLightWindow = new lightwindow();
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/web/app.js b/src/main/webapp/web/app.js
index e0470117b26..baf57a77394 100644
--- a/src/main/webapp/web/app.js
+++ b/src/main/webapp/web/app.js
@@ -70,7 +70,6 @@ oscarApp.config(['$stateProvider', '$urlRouterProvider', function ($stateProvide
.state('reports', {
url: '/reports',
templateUrl: 'report/reports.jsp',
- //templateUrl: 'report/reports_classic.jsp',
controller: 'ReportsCtrl'
})
.state('documents', {
@@ -269,7 +268,6 @@ $rootScope.$on('$stateChangeStart',function(event, toState, toParams, fromState,
oscarApp.filter('startFrom', function () {
return function (input, start) {
start = +start; //parse to int
- // return input.slice(start);
return input;
}
});
diff --git a/src/main/webapp/web/common/appServices.js b/src/main/webapp/web/common/appServices.js
index ab7ee7380e4..c158ac633e4 100644
--- a/src/main/webapp/web/common/appServices.js
+++ b/src/main/webapp/web/common/appServices.js
@@ -60,4 +60,4 @@ angular.module("appServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/components/provider/provider.component.js b/src/main/webapp/web/common/components/provider/provider.component.js
index d5b66f823d6..44f857739d9 100644
--- a/src/main/webapp/web/common/components/provider/provider.component.js
+++ b/src/main/webapp/web/common/components/provider/provider.component.js
@@ -20,4 +20,4 @@ const ProviderNameComponent = {
}
]
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/web/common/consentServices.js b/src/main/webapp/web/common/consentServices.js
index ba5e0bbfa19..d07d5884ff1 100644
--- a/src/main/webapp/web/common/consentServices.js
+++ b/src/main/webapp/web/common/consentServices.js
@@ -74,4 +74,4 @@ angular.module("consentServices", [])
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/demographicServices.js b/src/main/webapp/web/common/demographicServices.js
index 66f9dd6565c..604074c3567 100644
--- a/src/main/webapp/web/common/demographicServices.js
+++ b/src/main/webapp/web/common/demographicServices.js
@@ -34,7 +34,6 @@ angular.module("demographicServices", [])
},
getDemographic: function (demographicNo) {
- //$log.error("2Debug: calling getDemographic");
var deferred = $q.defer();
$http.get(this.apiPath + 'demographics/' + demographicNo, this.configHeadersWithCache).then(function (response) {
console.log(response.data);
@@ -99,4 +98,4 @@ angular.module("demographicServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/diseaseRegistryServices.js b/src/main/webapp/web/common/diseaseRegistryServices.js
index fd765260a8f..3e82b120fad 100644
--- a/src/main/webapp/web/common/diseaseRegistryServices.js
+++ b/src/main/webapp/web/common/diseaseRegistryServices.js
@@ -80,4 +80,4 @@ angular.module("diseaseRegistryServices", [])
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/formServices.js b/src/main/webapp/web/common/formServices.js
index 2b3dc6aa260..137e8074579 100644
--- a/src/main/webapp/web/common/formServices.js
+++ b/src/main/webapp/web/common/formServices.js
@@ -91,7 +91,6 @@ angular.module("formServices", [])
getGroupNames: function () {
var deferred = $q.defer();
$http.get(this.apiPath + '/groupNames', this.configHeaders).then(function (response) {
- //console.log('got group names !' + data.toSource());
deferred.resolve(response.data.content);
}, function () {
console.log("error fetching eforms");
@@ -127,7 +126,6 @@ angular.module("formServices", [])
getFormOptions: function (demographicNo) {
var deferred = $q.defer();
$http.get(this.apiPath + '/' + demographicNo + '/formOptions', this.configHeaders).then(function (response) {
- //console.log('got group names !' + data.toSource());
deferred.resolve(response.data);
}, function () {
console.log("error fetching eforms");
@@ -137,4 +135,4 @@ angular.module("formServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/inboxServices.js b/src/main/webapp/web/common/inboxServices.js
index a21da8a594c..1e4bd1921b7 100644
--- a/src/main/webapp/web/common/inboxServices.js
+++ b/src/main/webapp/web/common/inboxServices.js
@@ -61,4 +61,4 @@ angular.module("inboxServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/messageServices.js b/src/main/webapp/web/common/messageServices.js
index eac43bb295d..e23637bf2bc 100644
--- a/src/main/webapp/web/common/messageServices.js
+++ b/src/main/webapp/web/common/messageServices.js
@@ -47,4 +47,4 @@ angular.module("messageServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/personaServices.js b/src/main/webapp/web/common/personaServices.js
index a24bd0f3d3f..5707746cbf2 100644
--- a/src/main/webapp/web/common/personaServices.js
+++ b/src/main/webapp/web/common/personaServices.js
@@ -141,4 +141,4 @@ angular.module("personaServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/phrServices.js b/src/main/webapp/web/common/phrServices.js
index 6db23208f9a..17d44c50860 100644
--- a/src/main/webapp/web/common/phrServices.js
+++ b/src/main/webapp/web/common/phrServices.js
@@ -171,4 +171,4 @@ angular.module("phrServices", [])
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/preventionReportServices.js b/src/main/webapp/web/common/preventionReportServices.js
index c5336194ba2..254c9ed4e1e 100644
--- a/src/main/webapp/web/common/preventionReportServices.js
+++ b/src/main/webapp/web/common/preventionReportServices.js
@@ -1,4 +1,4 @@
-/*
+ /*
Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved.
This software is published under the GPL GNU General Public License.
diff --git a/src/main/webapp/web/common/programServices.js b/src/main/webapp/web/common/programServices.js
index 818d41c3ff8..5fac686e879 100644
--- a/src/main/webapp/web/common/programServices.js
+++ b/src/main/webapp/web/common/programServices.js
@@ -47,4 +47,4 @@ angular.module("programServices", [])
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/providerServices.js b/src/main/webapp/web/common/providerServices.js
index 64be098a0bd..1db2b720ca9 100644
--- a/src/main/webapp/web/common/providerServices.js
+++ b/src/main/webapp/web/common/providerServices.js
@@ -145,4 +145,4 @@ angular.module("providerServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/rxServices.js b/src/main/webapp/web/common/rxServices.js
index 025a24bb162..a985e8c09b4 100644
--- a/src/main/webapp/web/common/rxServices.js
+++ b/src/main/webapp/web/common/rxServices.js
@@ -161,8 +161,6 @@ angular.module("rxServices", [])
toSend.push(drugs[m].toDrugTransferObject(false));
}
- // var obj = {drug : toSend};
-
this._prescribe(demoNo, toSend).then(function (resp) {
return cb(resp.data);
});
@@ -322,19 +320,6 @@ angular.module("rxServices", [])
},
- /* addFavorite : function(fav, cb){
-
- var obj = fav.toTransferObject();
-
- this._addFavorite(obj).then(
- function(resp){
- console.log(resp);
- cb(resp);
- }
- );
-
- },
- */
getPrescriptions: function (demo) {
var deferred = $q.defer();
@@ -489,4 +474,4 @@ angular.module("rxServices", [])
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/securityServices.js b/src/main/webapp/web/common/securityServices.js
index 0daf641b80b..2db955466c1 100644
--- a/src/main/webapp/web/common/securityServices.js
+++ b/src/main/webapp/web/common/securityServices.js
@@ -89,4 +89,4 @@ angular.module("securityServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/ticklerServices.js b/src/main/webapp/web/common/ticklerServices.js
index 46ed52d41cb..1dda9071fb0 100644
--- a/src/main/webapp/web/common/ticklerServices.js
+++ b/src/main/webapp/web/common/ticklerServices.js
@@ -128,4 +128,4 @@ angular.module("ticklerServices", [])
return deferred.promise;
}
};
- });
\ No newline at end of file
+ });
diff --git a/src/main/webapp/web/common/uxServices.js b/src/main/webapp/web/common/uxServices.js
index 03d578eeff2..8d0339c4924 100644
--- a/src/main/webapp/web/common/uxServices.js
+++ b/src/main/webapp/web/common/uxServices.js
@@ -28,7 +28,6 @@ angular.module("uxServices", [])
return {
apiPath: '../ws/rs/recordUX',
getSummaryHeaders: function (demographicNo, key) {
- //
console.log("Debug: calling left");
var deferred = $q.defer();
$http.get(this.apiPath + '/' + demographicNo + '/summary/' + key).then(function (response) {
@@ -119,7 +118,6 @@ angular.module("uxServices", [])
return {
apiPath: '../ws/rs/recordUX',
menu: function (demographicNo) {
- //
console.log("Debug: calling left");
var deferred = $q.defer();
$http.get(this.apiPath + '/' + demographicNo + '/recordMenu').then(function (response) {
diff --git a/src/main/webapp/web/consults/consultRequestController.js b/src/main/webapp/web/consults/consultRequestController.js
index 5ca991224e9..d58ee5ee42c 100644
--- a/src/main/webapp/web/consults/consultRequestController.js
+++ b/src/main/webapp/web/consults/consultRequestController.js
@@ -305,7 +305,6 @@ oscarApp.controller('ConsultRequestCtrl', function ($scope, $http, $resource, $l
var demographicNo = consult.demographicId;
var letterheadFax = noNull(consult.letterheadFax);
var fax = noNull(consult.professionalSpecialist.faxNumber);
-// var faxRecipients = *additional fax recipients (can be >1)*
window.open("../fax/CoverPage.jsp?reqId=" + reqId + "&demographicNo=" + demographicNo + "&letterheadFax=" + letterheadFax + "&fax=" + fax);
}
diff --git a/src/main/webapp/web/dashboard/admin/dashboardManagerController.js b/src/main/webapp/web/dashboard/admin/dashboardManagerController.js
index 9d9917a67d2..47e687ea399 100644
--- a/src/main/webapp/web/dashboard/admin/dashboardManagerController.js
+++ b/src/main/webapp/web/dashboard/admin/dashboardManagerController.js
@@ -168,11 +168,3 @@ function sendData(path, param, target) {
}
});
}
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/web/dashboard/dashboardController.js b/src/main/webapp/web/dashboard/dashboardController.js
index 3c4c0de22ab..12c3f7f1334 100644
--- a/src/main/webapp/web/dashboard/dashboardController.js
+++ b/src/main/webapp/web/dashboard/dashboardController.js
@@ -312,7 +312,6 @@ oscarApp.controller('DashboardCtrl', function ($scope, providerService, ticklerS
});
modalInstance.result.then(function (data) {
- //console.log('data from modalInstance '+data);
if (data != null && data == true) {
$scope.updateTicklers();
}
diff --git a/src/main/webapp/web/dashboard/display/dashboardDisplayController.js b/src/main/webapp/web/dashboard/display/dashboardDisplayController.js
index 07aac575a43..666d2539f37 100644
--- a/src/main/webapp/web/dashboard/display/dashboardDisplayController.js
+++ b/src/main/webapp/web/dashboard/display/dashboardDisplayController.js
@@ -119,7 +119,7 @@ function buildIndicatorPanel(html, target, id) {
indicatorGraph.destroy();
}
- let panel = $("#" + target + "_" + id).html(html); //.append("" +id+ "
");
+ let panel = $("#" + target + "_" + id).html(html);
let data = "[" + panel.find("#graphPlots_" + id).val() + "]";
data = data.replace(/'/g, '"');
data = JSON.parse(data)
diff --git a/src/main/webapp/web/dashboard/display/drilldownDisplayController.js b/src/main/webapp/web/dashboard/display/drilldownDisplayController.js
index 4e1231d140a..874deffb2ff 100644
--- a/src/main/webapp/web/dashboard/display/drilldownDisplayController.js
+++ b/src/main/webapp/web/dashboard/display/drilldownDisplayController.js
@@ -84,8 +84,6 @@ $.fn.dataTableExt.afnFiltering.push(function (oSettings, aData, iDataIndex) {
var datofini = filterDate(aData[iStartDateCol]);
var datoffin = filterDate(aData[iEndDateCol]);
- // alert("In Low: " + inputLow + ', Low Filter: ' + iFini + ", In High: " + inputHigh + ", High Filter: " + iFfin + ", Condition: " + condition + ", Data: " + datofini);
-
if (condition === 'equal'
&& iFini !== iFini
&& new RegExp('^' + inputLow + '\.*$', 'i').test(datofini)) {
diff --git a/src/main/webapp/web/patientlist/patientListController.js b/src/main/webapp/web/patientlist/patientListController.js
index c885ec9cb2d..284845785a6 100644
--- a/src/main/webapp/web/patientlist/patientListController.js
+++ b/src/main/webapp/web/patientlist/patientListController.js
@@ -117,12 +117,6 @@ oscarApp.controller('PatientListCtrl', function ($scope, $http, $state, Navigati
}
-
- // $scope.$watch("currentPage", function(newValue, oldValue) {
- // console.log('currentPage changes from ' + oldValue + ' to ' + newValue);
- // });
-
-
$scope.$on('togglePatientListFilter', function (event, data) {
console.log("received a togglePatientListFilter event:" + data);
$scope.showFilter = data;
diff --git a/src/main/webapp/web/record/forms/formsController.js b/src/main/webapp/web/record/forms/formsController.js
index d7025fffa9a..31f77a1ea87 100644
--- a/src/main/webapp/web/record/forms/formsController.js
+++ b/src/main/webapp/web/record/forms/formsController.js
@@ -123,9 +123,6 @@ oscarApp.controller('FormCtrl', function ($scope, $http, $location, $stateParams
arr[0] = data.list;
$scope.page.encounterFormlist[0] = arr;
}
-
- //$scope.page.encounterFormlist[0] = data.list;
- //console.log("completed list as is:" + JSON.stringify($scope.page.encounterFormlist[0]) );
});
formService.getSelectedEncounterForms().then(function (data) {
@@ -161,7 +158,6 @@ oscarApp.controller('FormCtrl', function ($scope, $http, $location, $stateParams
if (item.type == 'eform') {
if (item.id != null) {
- //if(angular.isDefined(item.id)){
console.log('id is defined - ' + item.id);
addOrShow = '../eform/efmshowform_data.jsp?fdid=' + item.id;
} else {
@@ -223,10 +219,6 @@ oscarApp.controller('FormCtrl', function ($scope, $http, $location, $stateParams
var pymParent = new pym.Parent('formInViewFrame', url, {});
$scope.pymParent = pymParent;
- /*if(item.type != 'eform' && view==1){
- document.getElementById('formInViewFrame').firstChild.style.height = "1600px"; //temp hack for the forms
- }*/
-
//resize iframe for both form and eforms
$('iframe').load(function () {
var maxheight = Math.max(document.getElementById('formInViewFrame').firstChild.contentWindow.document.body.scrollHeight, document.getElementById('formInViewFrame').firstChild.contentWindow.document.body.offsetHeight) + 30 + 'px';
diff --git a/src/main/webapp/web/record/phr/phrController.js b/src/main/webapp/web/record/phr/phrController.js
index 82293de9acc..aee4dc6840d 100644
--- a/src/main/webapp/web/record/phr/phrController.js
+++ b/src/main/webapp/web/record/phr/phrController.js
@@ -63,16 +63,6 @@ oscarApp.controller('PHRCtrl', function ($scope, $http, $location, $stateParams,
type: 'window'
}];
-
- /*$scope.page.formlists.forEach(function (item, index) {
- console.log('What is the item ',item);
- formService.getAllFormsByHeading($stateParams.demographicNo,item.label).then(function(data) {
- console.debug('whats the index'+index,data);
- $scope.page.currentFormList[index] = data.list;
- });
- });
- */
-
$scope.changeTo = function (listId) {
$scope.page.currentlistId = listId;
console.log('set currentlist to ' + listId);
diff --git a/src/main/webapp/web/record/recordController.js b/src/main/webapp/web/record/recordController.js
index e6fed9f2f53..78aa9119375 100644
--- a/src/main/webapp/web/record/recordController.js
+++ b/src/main/webapp/web/record/recordController.js
@@ -100,9 +100,6 @@ oscarApp.controller('RecordCtrl', function ($rootScope, $scope, $http, $location
$scope.fillMenu();
- //var transitionP = $state.transitionTo($scope.recordtabs2[0].path,$stateParams,{location:'replace',notify:true});
- //console.log("transition ",transitionP);
-
$scope.changeTab = function (temp) {
$scope.currenttab2 = $scope.recordtabs2[temp.id];
@@ -129,10 +126,6 @@ oscarApp.controller('RecordCtrl', function ($rootScope, $scope, $http, $location
}
$scope.isTabActive = function (tab) {
- //console.log('current state '+$state.current.name.substring(0,tab.path.length)+" -- "+($state.current.name.substring(0,tab.path.length) == tab.path),$state.current.name,tab);
- //console.log('ddd '+$state.current.name.length+" eee "+tab.path.length);
- //if($state.current.name.length < tab.path.length) return "";
-
if (tab.dropdown) {
return "dropdown";
}
@@ -151,7 +144,7 @@ oscarApp.controller('RecordCtrl', function ($rootScope, $scope, $http, $location
});
- //////AutoSave
+ //AutoSave
var saveIntervalSeconds = 2;
var timeout = null;
@@ -183,7 +176,7 @@ oscarApp.controller('RecordCtrl', function ($rootScope, $scope, $http, $location
//////
- //////Timer
+ //Timer
var d = new Date(); //the start
var totalSeconds = 0;
diff --git a/src/main/webapp/web/record/rx/fullsearch/fullsearch.component.js b/src/main/webapp/web/record/rx/fullsearch/fullsearch.component.js
index c3d2f9ceb04..0d7d32933b8 100644
--- a/src/main/webapp/web/record/rx/fullsearch/fullsearch.component.js
+++ b/src/main/webapp/web/record/rx/fullsearch/fullsearch.component.js
@@ -12,15 +12,11 @@ const FullSearchComponent = {
fullSearchComp.$onInit = function () {
console.log("oninit drugHistoryComp component", this);
- //drugHistoryComp.drug = this.resolve.drug;
fullSearchComp.druglist = [];
fullSearchComp.brand = [];
fullSearchComp.gen = [];
fullSearchComp.afhcClass = [];
- //rxService.history(drugHistoryComp.drug, drugHistoryComp.drug.demographicNo, drugHistoryComp.fillMeds);
-
-
};
fullSearchComp.listBrands = function (drug) {
diff --git a/src/main/webapp/web/record/rx/print/print.component.js b/src/main/webapp/web/record/rx/print/print.component.js
index 35501f3e07b..acaecbceef6 100644
--- a/src/main/webapp/web/record/rx/print/print.component.js
+++ b/src/main/webapp/web/record/rx/print/print.component.js
@@ -66,9 +66,3 @@ const RxPrintComponent = {
}
]
};
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/web/record/rx/profile/profile.component.js b/src/main/webapp/web/record/rx/profile/profile.component.js
index 6c340b25169..dfeff492754 100644
--- a/src/main/webapp/web/record/rx/profile/profile.component.js
+++ b/src/main/webapp/web/record/rx/profile/profile.component.js
@@ -30,7 +30,7 @@ const RxProfileComponent = {
if (angular.isDefined(changesObj.fulldrugs)) {
console.log("was defined");
drugList = changesObj.fulldrugs.currentValue;
- fullDrugList = drugList;//$filter('orderBy')(drugList, 'rxDate', true);
+ fullDrugList = drugList;
rxProfileComp.processList(fullDrugList);
}
@@ -52,7 +52,6 @@ const RxProfileComponent = {
}
rxProfileComp.daysToExp = function (drug) {
- //console.log("drug--",drug);
var oneDay = 24 * 60 * 60 * 1000; // hours*minutes*seconds*milliseconds
var endDate = Date.parse(drug.endDate);
var now = new Date();
@@ -68,7 +67,6 @@ const RxProfileComponent = {
profileObject.profileHash = {};
profileObject.profileList = [];
for (i = 0; i < drugList.length; i++) {
- //console.log("here1."+i+" ",drugList[i]);
if (angular.isDefined(profileObject.profileHash[drugList[i].atc])) {
profileObject.profileHash[drugList[i].atc].push(drugList[i]);
} else {
@@ -368,17 +366,6 @@ const RxProfileComponent = {
}
rxProfileComp.hideFromCPP = function (drug) {
alert("Not Implemented Yet");
- /*
- function(event) {
- var val = $('hidecpp_242').checked;
- new Ajax.Request('/oscar/oscarRx/hideCpp.do?method=update&prescriptId=242&value=' + val, {
- method: 'get',
- onSuccess: function(transport) {}
- });
-
- }
-
- */
console.log("Not Implemented Yet", drug);
}
rxProfileComp.moveUpInList = function (drug) {
@@ -395,4 +382,4 @@ const RxProfileComponent = {
}
]
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/web/record/rx/rx.component.js b/src/main/webapp/web/record/rx/rx.component.js
index 8d9545e84c2..b4c4297912d 100644
--- a/src/main/webapp/web/record/rx/rx.component.js
+++ b/src/main/webapp/web/record/rx/rx.component.js
@@ -263,9 +263,6 @@ const RxComponent = {
d.rxDate = new Date();
d.custom = true;
d.repeats = 0;
- // if(angular.isDefined(d.id)){
- // delete d.id;
- // }
rxComp.toRxList.push(d);
}
@@ -321,9 +318,6 @@ const RxComponent = {
var d = new Drug();
d.applyFavorite(m);
d.writtenDate = new Date();
- // if(angular.isDefined(d.id)){
- // delete d.id;
- // }
rxComp.toRxList.push(d);
} else {
console.log("calling getMEd details ", med);
@@ -337,14 +331,10 @@ const RxComponent = {
newMed.newMed = true;
newMed.repeats = 0;
newMed.writtenDate = new Date();
- // if(angular.isDefined(newMed.id)){
- // delete newMed.id;
- // }
newMed.populateFromDrugSearchDetails(d.data.drugs[0]);
rxComp.toRxList.push(newMed);
rxComp.shortDSMessage();
- // updateStrengthUnits(d.drugs);
},
function (errorMessage) {
console.log("getMedicationDetails " + errorMessage);
@@ -402,4 +392,4 @@ const RxComponent = {
};
}]
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/web/record/rx/rxModel.js b/src/main/webapp/web/record/rx/rxModel.js
index 5f6425b54b6..863bf1189c2 100644
--- a/src/main/webapp/web/record/rx/rxModel.js
+++ b/src/main/webapp/web/record/rx/rxModel.js
@@ -604,7 +604,6 @@ Drug.prototype.refreshEndDate = function () {
Drug.prototype.rxDurationInDays = function () {
- //console.log("rxDur",this.endDate,this.rxDate,(this.endDate-this.rxDate), ((this.endDate-this.rxDate)/(1000*60*60*24)),(Math.round((this.endDate-this.rxDate)/(1000*60*60*24))));
return Math.round((this.endDate - this.rxDate) / (1000 * 60 * 60 * 24));
};
@@ -866,4 +865,4 @@ Favorite.prototype.fromDrug = function (d, name) {
this.name = name || this.drug.instructions;
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/web/record/rx/search/medsearch.component.js b/src/main/webapp/web/record/rx/search/medsearch.component.js
index 3cee027b47f..b71075dfeec 100644
--- a/src/main/webapp/web/record/rx/search/medsearch.component.js
+++ b/src/main/webapp/web/record/rx/search/medsearch.component.js
@@ -75,7 +75,6 @@ const MedsearchComponent = {
rxSearchComp.lookupMeds = function (val) {
var urlStr = "../ws/rs/rxlookup/search?string=" + val;
- //return $http.get(urlStr).then(function (response) {
return rxService.lookup(val).then(function (response) {
console.log("lookupMeds return ", response, rxSearchComp.favouriteMeds, val);
@@ -100,4 +99,4 @@ const MedsearchComponent = {
}
]
-};
\ No newline at end of file
+};
diff --git a/src/main/webapp/web/record/summary/summaryController.js b/src/main/webapp/web/record/summary/summaryController.js
index 451946feda5..b7b2be627ba 100644
--- a/src/main/webapp/web/record/summary/summaryController.js
+++ b/src/main/webapp/web/record/summary/summaryController.js
@@ -83,7 +83,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
$scope.openRevisionHistory = function (note) {
- //var rnd = Math.round(Math.random() * 1000);
win = "revision";
var url = "../CaseManagementEntry.do?method=notehistory¬eId=" + note.noteId;
window.open(url, win, "scrollbars=yes, location=no, width=647, height=600", "");
@@ -111,7 +110,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
$scope.isCurrentStatus = function (stat) {
- //console.log("stat",stat);
if (stat == $scope.page.currentFilter) {
return "active";
} else {
@@ -149,7 +147,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
noteService.getNotesFrom($stateParams.demographicNo, $scope.index, 20, $scope.page.noteFilter).then(function (data) {
console.debug('whats the data', angular.isUndefined(data.notelist), data.notelist);
if (angular.isDefined(data.notelist)) {
- //$scope.page.notes = data;
if (data.notelist instanceof Array) {
console.log("ok its in an array", $scope.busy);
for (var i = 0; i < data.notelist.length; i++) {
@@ -171,8 +168,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
};
- //$scope.addMoreItems();
-
$scope.editNote = function (note) {
$rootScope.$emit('loadNoteForEdit', note);
}
@@ -258,7 +253,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
var firstL = note.note.trim().split('\n')[0];
var dateStr = $filter('date')(note.observationDate, 'dd-MMM-yyyy');
dateStr = "[" + dateStr;
- //console.log(firstL + " --"+dateStr+"-- " + firstL.indexOf(dateStr));
if (firstL.indexOf(dateStr) == 0) {
firstL = firstL.substring(dateStr.length);
}
@@ -428,8 +422,6 @@ oscarApp.controller('SummaryCtrl', function ($rootScope, $scope, $http, $locatio
} else if (item.type == 'prevention') {
win = "prevention" + $stateParams.demographicNo;
} else {
- //item.type == 'lab' || item.type == 'document'
- //var rnd = Math.round(Math.random() * 1000);
win = "win_item.type_";
}
@@ -485,7 +477,6 @@ GroupNotesCtrl = function ($scope, $uibModal, $uibModalInstance, mod, action, us
$scope.page.items = mod.summaryItem;
$scope.page.quickLists = [];
- //$scope.action = action;
$scope.page.code = mod.summaryCode;
$scope.groupNotesForm = {assignedCMIssues: []};
@@ -551,7 +542,6 @@ GroupNotesCtrl = function ($scope, $uibModal, $uibModalInstance, mod, action, us
displayGroupNote = function (item, itemId) {
if ($scope.page.items[itemId].noteId != null) {
noteService.getIssueNote($scope.page.items[itemId].noteId).then(function (iNote) {
- //$scope.master = angular.copy( "iNote----" + JSON.stringify(iNote) );
$scope.groupNotesForm.encounterNote = iNote.encounterNote;
$scope.groupNotesForm.groupNoteExt = iNote.groupNoteExt;
$scope.groupNotesForm.assignedCMIssues = iNote.assignedCMIssues;
@@ -706,7 +696,6 @@ GroupNotesCtrl = function ($scope, $uibModal, $uibModalInstance, mod, action, us
}
$scope.archiveGroupNotes = function () {
- //$scope.master = angular.copy($scope.groupNotesForm);
$scope.groupNotesForm.encounterNote.archived = true;
$scope.saveGroupNotes();
}
@@ -870,7 +859,6 @@ RecordPrintCtrl = function ($scope, $uibModal, $uibModalInstance, mod, action, $
}
$scope.print = function () {
- //console.log('processList',mod);
console.log($scope.pageOptions);
var selectedList = [];
for (var i = 0; i < mod.length; i++) {
diff --git a/src/main/webapp/web/record/tracker/trackerController.js b/src/main/webapp/web/record/tracker/trackerController.js
index 88c167afa45..bb7a38b4113 100644
--- a/src/main/webapp/web/record/tracker/trackerController.js
+++ b/src/main/webapp/web/record/tracker/trackerController.js
@@ -42,7 +42,5 @@ function resizeIframe(iframe) {
var h = iframe.contentWindow.document.body.scrollHeight;
if (h > 0) {
iframe.height = h + "px";
- //alert("h > 0");
}
- //alert("h" + h);
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/web/report/reportsController.js b/src/main/webapp/web/report/reportsController.js
index b1a1d2e6f51..8a847304925 100644
--- a/src/main/webapp/web/report/reportsController.js
+++ b/src/main/webapp/web/report/reportsController.js
@@ -446,4 +446,3 @@ oscarApp.controller('ReportSHMentalHealthCtrl', function ($scope, $log, $filter)
}
});
-
diff --git a/src/main/webapp/web/schedule/scheduleController.js b/src/main/webapp/web/schedule/scheduleController.js
index af317e2a118..4f3fa5de381 100644
--- a/src/main/webapp/web/schedule/scheduleController.js
+++ b/src/main/webapp/web/schedule/scheduleController.js
@@ -1,5 +1,3 @@
oscarApp.controller('ScheduleCtrl', function ($scope) {
});
-
-
diff --git a/src/main/webapp/web/settings/settingsController.js b/src/main/webapp/web/settings/settingsController.js
index 2103cc03196..058cb1de912 100644
--- a/src/main/webapp/web/settings/settingsController.js
+++ b/src/main/webapp/web/settings/settingsController.js
@@ -202,12 +202,6 @@ oscarApp.controller('SettingsCtrl', function ($scope, $http, $state, providerLis
$scope.openChangePasswordModal = function () {
- /*
- var modalInstance = $uibModal.open({
- templateUrl: 'settings/changePassword.jsp',
- controller: 'ChangePasswordCtrl'
- });
- */
window.open('../provider/providerchangepassword.jsp', 'change_password', 'width=750,height=500');
}
@@ -264,7 +258,6 @@ oscarApp.controller('SettingsCtrl', function ($scope, $http, $state, providerLis
console.log("applist:" + errorMessage);
}
);
- ///
console.log("refresh", $scope.loadedApps);
}
@@ -293,8 +286,7 @@ oscarApp.controller('QuickLinkCtrl', function ($scope, $uibModalInstance) {
$scope.addQuickLink = function (qlForm) {
if (qlForm.$valid) {
- // alert($scope.qll.toSource());
$uibModalInstance.close($scope.qll);
}
}
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/web/tickler/ticklerAddController.js b/src/main/webapp/web/tickler/ticklerAddController.js
index 68c0644b832..f5b75dc5de1 100644
--- a/src/main/webapp/web/tickler/ticklerAddController.js
+++ b/src/main/webapp/web/tickler/ticklerAddController.js
@@ -126,4 +126,3 @@ oscarApp.controller('TicklerAddController', function ($scope, $uibModalInstance,
}
}
});
-
diff --git a/src/main/webapp/web/tickler/ticklerController.js b/src/main/webapp/web/tickler/ticklerController.js
index adfa32fa752..f3b891961f3 100644
--- a/src/main/webapp/web/tickler/ticklerController.js
+++ b/src/main/webapp/web/tickler/ticklerController.js
@@ -115,7 +115,6 @@ oscarApp.controller('TicklerListCtrl', function ($scope, $timeout, $resource, ng
$scope.addTickler = function () {
var windowProps = "height=400,width=600,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes";
- //window.open('../tickler/ticklerAdd.jsp','ticklerAdd',windowProps);
var modalInstance = $uibModal.open({
templateUrl: 'tickler/ticklerAdd.jsp',
@@ -251,4 +250,3 @@ oscarApp.controller('TicklerCommentController', function ($scope, $uibModalInsta
$uibModalInstance.close("Someone Closed Me");
};
});
-
From 8e9632c1b66cfd1ab469cd1ae3248b554e142f4b Mon Sep 17 00:00:00 2001
From: garciaerin
Date: Tue, 19 Nov 2024 10:17:45 -0500
Subject: [PATCH 2/2] clean: removed unreferenced custom .js files
---
src/main/webapp/hcHandler/hcHandlerSearch.js | 89 -
src/main/webapp/js/DemographicInfo.js | 182 --
src/main/webapp/js/custom/default/adddemo.js | 11 -
src/main/webapp/js/custom/default/master.js | 2 -
src/main/webapp/js/custom/eyeform/master.js | 3 -
.../webapp/js/custom/eyeform_poc/master.js | 3 -
src/main/webapp/js/custom/ocan-staff.js | 67 -
src/main/webapp/js/custom/ocean/adddemo.js | 11 -
src/main/webapp/js/custom/ocean/master.js | 2 -
src/main/webapp/js/custom/renal/adddemo.js | 11 -
src/main/webapp/js/custom/renal/diab.js | 73 -
.../webapp/js/custom/renal/health_tracker.js | 25 -
src/main/webapp/js/custom/renal/indicators.js | 66 -
src/main/webapp/js/custom/renal/master.js | 2 -
src/main/webapp/js/custom/westernu/adddemo.js | 180 --
.../js/custom/westernu/billingInvoice.js | 6 -
.../js/custom/westernu/billingreview.js | 23 -
src/main/webapp/js/custom/westernu/master.js | 2 -
src/main/webapp/js/hideexpand.js | 207 ---
src/main/webapp/js/oscarRx.js | 1633 -----------------
.../webapp/js/searchContactAutocomplete.js | 63 -
src/main/webapp/js/simpletreemenu.js | 133 --
src/main/webapp/js/slidemenu.js | 279 ---
.../calendar/calendar-handler_stripped.js | 1 -
.../webapp/share/calendar/lang/calendar-eu.js | 129 --
.../share/calendar/lang/calendar-ru-UTF.js | 122 --
.../share/calendar/lang/calendar-sr-utf8.js | 107 --
.../webapp/share/calendar/lang/calendar-sr.js | Bin 5808 -> 0 bytes
src/main/webapp/share/javascript/builder.js | 136 --
src/main/webapp/share/javascript/dragdrop.js | 998 ----------
.../forms/forms-quill-image-placeholder.js | 22 -
.../forms-quill-register-inline-styles.js | 39 -
.../forms-quill-template-block-placeholder.js | 37 -
.../forms/forms-quill-template-editor.js | 425 -----
.../forms/forms-quill-template-placeholder.js | 35 -
src/main/webapp/share/javascript/sound.js | 58 -
.../user-satisfaction_questionnaire.js | 263 ---
37 files changed, 5445 deletions(-)
delete mode 100644 src/main/webapp/hcHandler/hcHandlerSearch.js
delete mode 100755 src/main/webapp/js/DemographicInfo.js
delete mode 100644 src/main/webapp/js/custom/default/adddemo.js
delete mode 100644 src/main/webapp/js/custom/default/master.js
delete mode 100644 src/main/webapp/js/custom/eyeform/master.js
delete mode 100644 src/main/webapp/js/custom/eyeform_poc/master.js
delete mode 100755 src/main/webapp/js/custom/ocan-staff.js
delete mode 100644 src/main/webapp/js/custom/ocean/adddemo.js
delete mode 100644 src/main/webapp/js/custom/ocean/master.js
delete mode 100644 src/main/webapp/js/custom/renal/adddemo.js
delete mode 100644 src/main/webapp/js/custom/renal/diab.js
delete mode 100644 src/main/webapp/js/custom/renal/health_tracker.js
delete mode 100644 src/main/webapp/js/custom/renal/indicators.js
delete mode 100644 src/main/webapp/js/custom/renal/master.js
delete mode 100644 src/main/webapp/js/custom/westernu/adddemo.js
delete mode 100644 src/main/webapp/js/custom/westernu/billingInvoice.js
delete mode 100644 src/main/webapp/js/custom/westernu/billingreview.js
delete mode 100644 src/main/webapp/js/custom/westernu/master.js
delete mode 100755 src/main/webapp/js/hideexpand.js
delete mode 100644 src/main/webapp/js/oscarRx.js
delete mode 100644 src/main/webapp/js/searchContactAutocomplete.js
delete mode 100755 src/main/webapp/js/simpletreemenu.js
delete mode 100755 src/main/webapp/js/slidemenu.js
delete mode 100755 src/main/webapp/share/calendar/calendar-handler_stripped.js
delete mode 100755 src/main/webapp/share/calendar/lang/calendar-eu.js
delete mode 100755 src/main/webapp/share/calendar/lang/calendar-ru-UTF.js
delete mode 100755 src/main/webapp/share/calendar/lang/calendar-sr-utf8.js
delete mode 100755 src/main/webapp/share/calendar/lang/calendar-sr.js
delete mode 100755 src/main/webapp/share/javascript/builder.js
delete mode 100755 src/main/webapp/share/javascript/dragdrop.js
delete mode 100644 src/main/webapp/share/javascript/forms/forms-quill-image-placeholder.js
delete mode 100644 src/main/webapp/share/javascript/forms/forms-quill-register-inline-styles.js
delete mode 100644 src/main/webapp/share/javascript/forms/forms-quill-template-block-placeholder.js
delete mode 100644 src/main/webapp/share/javascript/forms/forms-quill-template-editor.js
delete mode 100644 src/main/webapp/share/javascript/forms/forms-quill-template-placeholder.js
delete mode 100755 src/main/webapp/share/javascript/sound.js
delete mode 100755 src/main/webapp/survey/scripts/user-satisfaction_questionnaire.js
diff --git a/src/main/webapp/hcHandler/hcHandlerSearch.js b/src/main/webapp/hcHandler/hcHandlerSearch.js
deleted file mode 100644
index a7e01a8c132..00000000000
--- a/src/main/webapp/hcHandler/hcHandlerSearch.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var _hc_windowTimeout;
-
-var _hc_searchHandler = function (args) {
- clearTimeout(_hc_windowTimeout);
-
- var window = jQuery("#_hc_window");
- jQuery(window).find("#_hc_message, #_hc_read, #_hc_actions, #_hc_match, #_hc_noMatch, #_hc_matchSearch, #_hc_closeBtn").hide();
-
- jQuery(window).find("._hc_mismatch").removeClass("_hc_mismatch");
- jQuery(window).find("#_hc_errors").children().remove();
-
- if (!(typeof args["error"] == "undefined")) {
- jQuery(window).find("#_hc_closeBtn").hide();
-
- jQuery(window).find("#_hc_status_text_success").hide();
- jQuery(window).find("#_hc_status_text_error, #_hc_message_tryAgain, #_hc_message").show();
-
- jQuery(window).find("#_hc_status_icon").attr("class", "_hc_inlineBlock _hc_status_error");
-
- if (args["error"] == "INVALID") {
- jQuery(window).find("#_hc_message_readError").css("display", "inline-block");
- jQuery(window).find("#_hc_message_issuerError").css("display", "none");
- } else if (args["error"] == "ISSUER") {
- jQuery(window).find("#_hc_message_readError").css("display", "none");
- jQuery(window).find("#_hc_message_issuerError").css("display", "inline-block");
- } else {
- jQuery(window).find("#_hc_message_readError").css("display", "none");
- jQuery(window).find("#_hc_message_issuerError").css("display", "none");
- }
-
- _hc_windowTimeout = setTimeout(function () {
- jQuery("#_hc_window").css("display", "none");
- }, 3000);
-
-
- } else {
- jQuery(window).find("#_hc_status_text_success, #_hc_read, #_hc_layout").show();
- jQuery(window).find("#_hc_message, #_hc_status_text_error").hide();
- jQuery(window).find("#_hc_status_icon").attr("class", "_hc_inlineBlock _hc_status_success");
-
- jQuery(window).find("#_hc_layout_name").text(args["lastName"] + ", " + args["firstName"]);
- jQuery(window).find("#_hc_layout_hin_num").html(args["hin"].substring(0, 4) + "• " + args["hin"].substring(4, 7) + "• " + args["hin"].substring(7, 10) + "•");
- jQuery(window).find("#_hc_layout_hin_ver").text(args["hinVer"]);
-
- jQuery(window).find("#_hc_layout_info_dob").text(args["dob"].substring(0, 4) + "/" + args["dob"].substring(4, 6) + "/" + args["dob"].substring(6, 8));
- jQuery(window).find("#_hc_layout_info_sex").text((args["sex"] == "1" ? "M" : (args["sex"] == "2" ? "F" : "")));
-
- var issueDate = (args["issueDate"].substring(0, 2) <= 30 ? "20" : "19") + args["issueDate"];
- jQuery(window).find("#_hc_layout_valid_from").text(issueDate.substring(0, 4) + "/" + issueDate.substring(4, 6) + "/" + issueDate.substring(6, 8));
-
- var hinExp = (args["hinExp"].substring(0, 2) <= 30 ? "20" : "19") + args["hinExp"];
- jQuery(window).find("#_hc_layout_valid_to").text(hinExp.substring(0, 4) + "/" + hinExp.substring(4, 6));
-
-
- if (hinExp != "0000") {
- var hinExp = (args["hinExp"].substring(0, 2) <= 30 ? "20" : "19") + args["hinExp"] + args["dob"].substring(6, 8);
- jQuery(window).find("#_hc_layout_valid_to").text(hinExp.substring(0, 4) + "/" + hinExp.substring(4, 6) + "/" + hinExp.substring(6, 8));
-
- var date = new Date();
- var hinExpDate = new Date(hinExp.substring(0, 4) + "/" + hinExp.substring(4, 6) + "/" + hinExp.substring(6, 8));
- if (hinExpDate <= new Date()) {
- jQuery(window).find("#_hc_layout_valid_to").addClass("_hc_mismatch");
- jQuery(window).find("#_hc_errors").append("This health card has expired.
");
- }
-
- }
-
- jQuery("input[name='keyword']").val(args["hin"]);
- jQuery("input[name='search_mode'][value='search_hin']").attr("checked", "checked");
-
- jQuery("form[name='titlesearch']").submit();
-
- _hc_windowTimeout = setTimeout(function () {
- jQuery("#_hc_window").css("display", "none");
- }, 3000);
- }
-
- jQuery(window).css("display", "block");
-}
-
-jQuery(document).ready(function () {
- jQuery("#_hc_window #_hc_matchSearch img").attr("src", ctx + "/images/DMSLoader.gif");
-
- jQuery("#_hc_window #_hc_closeBtn").click(function () {
- jQuery("#_hc_window").hide();
- });
-
- new HealthCardHandler(_hc_searchHandler);
-});
\ No newline at end of file
diff --git a/src/main/webapp/js/DemographicInfo.js b/src/main/webapp/js/DemographicInfo.js
deleted file mode 100755
index 5571cf3a63b..00000000000
--- a/src/main/webapp/js/DemographicInfo.js
+++ /dev/null
@@ -1,182 +0,0 @@
-function redirectToClientSearch(demographicNo, startRowCount, path) {
-
- document.demographicForm.action = path + "?demographicNo=" + demographicNo +
- "&rowCountPassStr=" + startRowCount;
- document.demographicForm.submit();
-}
-
-function rs(n, u, w, h, x) {
- args = "width=" + w + ",height=" + h + ",resizable=yes,scrollbars=yes,status=0,top=360,left=30";
- remote = window.open(u, n, args);
- if (remote != null) {
- if (remote.opener == null)
- remote.opener = self;
- }
- if (x == 1) {
- return remote;
- }
-}
-
-var awnd = null;
-
-function ScriptAttach() {
- awnd = rs('swipe', 'zdemographicswipe.htm', 600, 600, 1);
- awnd.focus();
-}
-
-function setfocus() {
- this.focus();
- document.titlesearch.keyword.focus();
- document.titlesearch.keyword.select();
-}
-
-function upCaseCtrl(ctrl) {
- ctrl.value = ctrl.value.toUpperCase();
-}
-
-function popupPage(vheight, vwidth, varpage) { //open a new popup window
- var page = "" + varpage;
- windowprops = "height=" + vheight + ",width=" + vwidth + ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=50,screenY=50,top=20,left=20";
- var popup = window.open(page, "demodetail", windowprops);
- if (popup != null) {
- if (popup.opener == null) {
- popup.opener = self;
- }
- }
-}
-
-function popupEChart(vheight, vwidth, varpage) { //open a new popup window
- var page = "" + varpage;
- windowprops = "height=" + vheight + ",width=" + vwidth + ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=50,screenY=50,top=20,left=20";
- var popup = window.open(page, "apptProvider", windowprops);
- if (popup != null) {
- if (popup.opener == null) {
- popup.opener = self;
- }
- }
-}
-
-function popupOscarRx(vheight, vwidth, varpage) { //open a new popup window
- var page = varpage;
- windowprops = "height=" + vheight + ",width=" + vwidth + ",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
- var popup = window.open(varpage, "oscarRx", windowprops);
- if (popup != null) {
- if (popup.opener == null) {
- popup.opener = self;
- }
- }
-}
-
-function checkTypeIn() {
- var dob = document.titlesearch.keyword;
- typeInOK = false;
-
- if (document.titlesearch.search_mode[2].checked) {
- if (dob.value.length == 8) {
- dob.value = dob.value.substring(0, 4) + "-" + dob.value.substring(4, 6) + "-" + dob.value.substring(6, 8);
- //alert(dob.value.length);
- typeInOK = true;
- }
- if (dob.value.length != 10) {
- alert("You have a wrong DOB input!!!");
- typeInOK = false;
- }
-
- return typeInOK;
- } else {
- return true;
- }
-}
-
-function checkTypeInEdit() {
- var typeInOK = false;
- if (document.updatedelete.last_name.value != "" && document.updatedelete.first_name.value != "" && document.updatedelete.sex.value != "") {
- if (checkTypeNum(document.updatedelete.year_of_birth.value) && checkTypeNum(document.updatedelete.month_of_birth.value) && checkTypeNum(document.updatedelete.date_of_birth.value)) {
- typeInOK = true;
- }
- }
- if (!typeInOK) alert("You must type in the following fields: Last Name, First Name, DOB, and Sex.");
- return typeInOK;
-}
-
-function checkTypeNum(typeIn) {
- var typeInOK = true;
- var i = 0;
- var length = typeIn.length;
- var ch;
- // walk through a string and find a number
- if (length >= 1) {
- while (i < length) {
- ch = typeIn.substring(i, i + 1);
- if (ch == "-") {
- i++;
- continue;
- }
- if ((ch < "0") || (ch > "9")) {
- typeInOK = false;
- break;
- }
- i++;
- }
- } else typeInOK = false;
- return typeInOK;
-}
-
-function formatPhoneNum() {
- if (document.updatedelete.phone.value.length == 10) {
- document.updatedelete.phone.value = document.updatedelete.phone.value.substring(0, 3) + "-" + document.updatedelete.phone.value.substring(3, 6) + "-" + document.updatedelete.phone.value.substring(6);
- }
- if (document.updatedelete.phone.value.length == 11 && document.updatedelete.phone.value.charAt(3) == '-') {
- document.updatedelete.phone.value = document.updatedelete.phone.value.substring(0, 3) + "-" + document.updatedelete.phone.value.substring(4, 7) + "-" + document.updatedelete.phone.value.substring(7);
- }
- if (document.updatedelete.phone2.value.length == 10) {
- document.updatedelete.phone2.value = document.updatedelete.phone2.value.substring(0, 3) + "-" + document.updatedelete.phone2.value.substring(3, 6) + "-" + document.updatedelete.phone2.value.substring(6);
- }
- if (document.updatedelete.phone2.value.length == 11 && document.updatedelete.phone2.value.charAt(3) == '-') {
- document.updatedelete.phone2.value = document.updatedelete.phone2.value.substring(0, 3) + "-" + document.updatedelete.phone2.value.substring(4, 7) + "-" + document.updatedelete.phone2.value.substring(7);
- }
-}
-
-function checkONReferralNo() {
- var referralNo = document.updatedelete.r_doctor_ohip.value;
- if (document.updatedelete.hc_type.value == 'ON' && referralNo.length > 0 && referralNo.length != 6) {
- alert("The referral doctor's no. is wrong. Please correct it!");
- }
-}
-
-function refresh() {
- //history.go(0);
-}
-
-function rs(n, u, w, h, x) {
- args = "width=" + w + ",height=" + h + ",resizable=yes,scrollbars=yes,status=0,top=60,left=30";
- remote = window.open(u, n, args);
-}
-
-function referralScriptAttach2(elementName, name2) {
- var d = elementName;
- t0 = escape("document.forms[1].elements[\'" + d + "\'].value");
- t1 = escape("document.forms[1].elements[\'" + name2 + "\'].value");
- rs('att', ('../billing/CA/ON/searchRefDoc.jsp?param=' + t0 + '¶m2=' + t1), 600, 600, 1);
-}
-
-function newStatus() {
- newOpt = prompt("Please enter the new status:", "");
- if (newOpt != "") {
- document.updatedelete.patient_status.options[document.updatedelete.patient_status.length] = new Option(newOpt, newOpt);
- document.updatedelete.patient_status.options[document.updatedelete.patient_status.length - 1].selected = true;
- } else {
- alert("Invalid entry");
- }
-}
-
-function searchInactive() {
- document.titlesearch.ptstatus.value = "inactive";
- if (checkTypeIn()) document.titlesearch.submit();
-}
-
-function searchAll() {
- document.titlesearch.ptstatus.value = "";
- if (checkTypeIn()) document.titlesearch.submit();
-}
-
diff --git a/src/main/webapp/js/custom/default/adddemo.js b/src/main/webapp/js/custom/default/adddemo.js
deleted file mode 100644
index 44d0c5d90bb..00000000000
--- a/src/main/webapp/js/custom/default/adddemo.js
+++ /dev/null
@@ -1,11 +0,0 @@
-jQuery(document).ready(function () {
-
- jQuery("#addDemographicTbl #renewDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #renewDate").css("display", "none");
- jQuery("#addDemographicTbl #countryLbl").insertAfter(jQuery("#addDemographicTbl #hcType"));
- jQuery("#addDemographicTbl #countryCell").insertAfter(jQuery("#addDemographicTbl #countryLbl"));
-
- jQuery("#last_name").focus();
- jQuery("#last_name").select();
- window.resizeTo(1100, 700);
-});
diff --git a/src/main/webapp/js/custom/default/master.js b/src/main/webapp/js/custom/default/master.js
deleted file mode 100644
index 3c1456cb63b..00000000000
--- a/src/main/webapp/js/custom/default/master.js
+++ /dev/null
@@ -1,2 +0,0 @@
-jQuery(document).ready(function () {
-});
diff --git a/src/main/webapp/js/custom/eyeform/master.js b/src/main/webapp/js/custom/eyeform/master.js
deleted file mode 100644
index af96160c837..00000000000
--- a/src/main/webapp/js/custom/eyeform/master.js
+++ /dev/null
@@ -1,3 +0,0 @@
-jQuery(document).ready(function () {
- jQuery("#appt_hx").after("| Exam History |
");
-});
diff --git a/src/main/webapp/js/custom/eyeform_poc/master.js b/src/main/webapp/js/custom/eyeform_poc/master.js
deleted file mode 100644
index af96160c837..00000000000
--- a/src/main/webapp/js/custom/eyeform_poc/master.js
+++ /dev/null
@@ -1,3 +0,0 @@
-jQuery(document).ready(function () {
- jQuery("#appt_hx").after("| Exam History |
");
-});
diff --git a/src/main/webapp/js/custom/ocan-staff.js b/src/main/webapp/js/custom/ocan-staff.js
deleted file mode 100755
index 0a180603bd4..00000000000
--- a/src/main/webapp/js/custom/ocan-staff.js
+++ /dev/null
@@ -1,67 +0,0 @@
-$(document).ready(function () {
-
-
- $("input[name='intake.answerMapped(201146).value']").change(function () {
- $("input[name='intake.answerMapped(201145).value']").attr('checked', true);
- });
-
- //initialize validate - we can just do this in main jsp
- $("form").validate({meta: "validate"});
-
- //service org name/number - set variables, and set to read-only
- $("input[question_id='service_org_name']").val($("#facility_name").val());
- $("input[question_id='service_org_number']").val($("#ocan_service_org_number").val());
- $("input[question_id='service_org_name']").attr("disabled", true);
- $("input[question_id='service_org_number']").attr("disabled", true);
-
-
- //onsubmit
- $("form").submit(function () {
- if (!$("form").valid()) {
- return false;
- }
-
- if (!validateStartAndCompletionDates()) {
- return false;
- }
-
- if ($("select[question_id='reason_for_assessment']").val() == 'OTHR') {
- if ($("[question_id='reason_for_assessment_other']").val().length == 0) {
- alert('Reason for assessment - Please specify other');
- return false;
- }
- }
-
- alert('passed validation');
- return false;
- });
-
-});
-
-function validateStartAndCompletionDates() {
- var start_date = $("input[question_id='start_date']").val();
- var completion_date = $("input[question_id='completion_date']").val();
-
- sd = start_date.split("-");
- cd = completion_date.split("-");
-
- var sdd = new Date(sd[0], sd[1] - 1, sd[2]);
- var cdd = new Date(cd[0], cd[1] - 1, cd[2]);
-
- if (cdd <= sdd) {
- alert('Completion Date must be after Start Date');
- return false;
- }
-
- var millis = cdd.getTime() - sdd.getTime();
- var secs = millis / 1000;
- var mins = secs / 60;
- var hours = mins / 60;
- var days = hours / 24;
-
- if (days > 30) {
- alert('Completion Date must be within 30 days of Start Date');
- return false;
- }
- return true;
-}
\ No newline at end of file
diff --git a/src/main/webapp/js/custom/ocean/adddemo.js b/src/main/webapp/js/custom/ocean/adddemo.js
deleted file mode 100644
index 44d0c5d90bb..00000000000
--- a/src/main/webapp/js/custom/ocean/adddemo.js
+++ /dev/null
@@ -1,11 +0,0 @@
-jQuery(document).ready(function () {
-
- jQuery("#addDemographicTbl #renewDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #renewDate").css("display", "none");
- jQuery("#addDemographicTbl #countryLbl").insertAfter(jQuery("#addDemographicTbl #hcType"));
- jQuery("#addDemographicTbl #countryCell").insertAfter(jQuery("#addDemographicTbl #countryLbl"));
-
- jQuery("#last_name").focus();
- jQuery("#last_name").select();
- window.resizeTo(1100, 700);
-});
diff --git a/src/main/webapp/js/custom/ocean/master.js b/src/main/webapp/js/custom/ocean/master.js
deleted file mode 100644
index 3c1456cb63b..00000000000
--- a/src/main/webapp/js/custom/ocean/master.js
+++ /dev/null
@@ -1,2 +0,0 @@
-jQuery(document).ready(function () {
-});
diff --git a/src/main/webapp/js/custom/renal/adddemo.js b/src/main/webapp/js/custom/renal/adddemo.js
deleted file mode 100644
index 44d0c5d90bb..00000000000
--- a/src/main/webapp/js/custom/renal/adddemo.js
+++ /dev/null
@@ -1,11 +0,0 @@
-jQuery(document).ready(function () {
-
- jQuery("#addDemographicTbl #renewDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #renewDate").css("display", "none");
- jQuery("#addDemographicTbl #countryLbl").insertAfter(jQuery("#addDemographicTbl #hcType"));
- jQuery("#addDemographicTbl #countryCell").insertAfter(jQuery("#addDemographicTbl #countryLbl"));
-
- jQuery("#last_name").focus();
- jQuery("#last_name").select();
- window.resizeTo(1100, 700);
-});
diff --git a/src/main/webapp/js/custom/renal/diab.js b/src/main/webapp/js/custom/renal/diab.js
deleted file mode 100644
index c5e5cc5c949..00000000000
--- a/src/main/webapp/js/custom/renal/diab.js
+++ /dev/null
@@ -1,73 +0,0 @@
-function addToDx(codingSystem, code) {
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=addtoDx&demographicNo=" + getDemographicNo() + "&codingSystem=" + codingSystem + "&code=" + code,
- async: false,
- success: function (data) {
- if (data.result != '0') {
- alert('added to Dx');
- }
- location.href = 'TemplateFlowSheet.jsp?demographic_no=' + getDemographicNo() + '&template=diab2';
- }
- });
-}
-
-jQuery(document).ready(function () {
- jQuery("#print_box").before(
- "" +
- "
" +
- "
" +
- "
" +
- "- Next Steps:
" +
- "
" +
- "
" +
- "
" +
- "" +
- "Add Renal" +
- "
"
- );
-
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=250",
- async: false,
- success: function (data) {
- //got it
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append("Add Diabetes to Dx");
- }
- }
- });
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=401",
- async: false,
- success: function (data) {
- //got it
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append("Add Hypertension to Dx");
- }
- }
- });
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=585",
- async: false,
- success: function (data) {
- //got it
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append("Add Chronic Renal Failure to Dx");
- }
- }
- });
-
- //next steps
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=getNextSteps&demographicNo=" + getDemographicNo(),
- async: false,
- success: function (data) {
- jQuery("#renal_next_steps").html(data.result);
- }
- });
-
-
-});
\ No newline at end of file
diff --git a/src/main/webapp/js/custom/renal/health_tracker.js b/src/main/webapp/js/custom/renal/health_tracker.js
deleted file mode 100644
index 9e6ad8b4464..00000000000
--- a/src/main/webapp/js/custom/renal/health_tracker.js
+++ /dev/null
@@ -1,25 +0,0 @@
-function addToDx(codingSystem, code) {
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=addtoDx&demographicNo=" + getDemographicNo() + "&codingSystem=" + codingSystem + "&code=" + code,
- async: false,
- success: function (data) {
- if (data.result != '0') {
- alert('added to Dx');
- location.href = 'TemplateFlowSheet.jsp?demographic_no=' + getDemographicNo() + '&template=diab3';
- }
- }
- });
-}
-
-jQuery(document).ready(function () {
-
- //next steps
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=getNextSteps&demographicNo=" + getDemographicNo(),
- async: false,
- success: function (data) {
- jQuery("#renal_next_steps").html(data.result);
- }
- });
-
-});
diff --git a/src/main/webapp/js/custom/renal/indicators.js b/src/main/webapp/js/custom/renal/indicators.js
deleted file mode 100644
index 321e0a35a9c..00000000000
--- a/src/main/webapp/js/custom/renal/indicators.js
+++ /dev/null
@@ -1,66 +0,0 @@
-function addToDx(codingSystem, code) {
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=addtoDx&demographicNo=" + getDemographicNo() + "&codingSystem=" + codingSystem + "&code=" + code,
- async: false,
- success: function (data) {
- if (data.result != '0') {
- alert('added to Dx');
- location.href = 'TemplateFlowSheet.jsp?demographic_no=' + getDemographicNo() + '&template=diab3';
- }
- }
- });
-}
-
-jQuery(document).ready(function () {
- $('#Renal_update').before(
- "| Next Steps | " +
- "" +
- " |
" +
- "" +
- "| CSN Algorithm Detection, Monitoring & Referral of CKD |
" +
- "| | Kidney Foundation of Canada |
" +
- " | " +
- " |
"
- );
-
-
- $('#Renal_update_comments').css('border', 'none');
-
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=250",
- async: false,
- success: function (data) {
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append(" ");
- }
- }
- });
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=401",
- async: false,
- success: function (data) {
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append(" ");
- }
- }
- });
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=checkForDx&demographicNo=" + getDemographicNo() + "&codingSystem=icd9&code=585",
- async: false,
- success: function (data) {
- if (data.result == false) {
- jQuery('#dxaddshortcut_list').append("");
- }
- }
- });
-
- //next steps
- jQuery.ajax({
- url: getContextPath() + "/renal/Renal.do?method=getNextSteps&demographicNo=" + getDemographicNo(),
- async: false,
- success: function (data) {
- jQuery("#renal_next_steps").html(data.result);
- }
- });
-
-});
diff --git a/src/main/webapp/js/custom/renal/master.js b/src/main/webapp/js/custom/renal/master.js
deleted file mode 100644
index 3c1456cb63b..00000000000
--- a/src/main/webapp/js/custom/renal/master.js
+++ /dev/null
@@ -1,2 +0,0 @@
-jQuery(document).ready(function () {
-});
diff --git a/src/main/webapp/js/custom/westernu/adddemo.js b/src/main/webapp/js/custom/westernu/adddemo.js
deleted file mode 100644
index 335c2a7e3a3..00000000000
--- a/src/main/webapp/js/custom/westernu/adddemo.js
+++ /dev/null
@@ -1,180 +0,0 @@
-jQuery(document).ready(function () {
- jQuery(jQuery("").append(jQuery("#addDemographicTbl #chartNoLbl")).append(jQuery("#addDemographicTbl #chartNo")).append(jQuery("#addDemographicTbl #hinLbl")).append(jQuery("#addDemographicTbl #hinVer"))).insertBefore(jQuery("#addDemographicTbl tr:first"));
- jQuery("#addDemographicTbl #hcTypeLbl").insertAfter(jQuery("#addDemographicTbl #lastName"));
- jQuery("#addDemographicTbl #hcType").insertAfter(jQuery("#addDemographicTbl #hcTypeLbl"));
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #firstNameLbl")).append(jQuery("#addDemographicTbl #firstName"))).insertAfter(jQuery("#addDemographicTbl #rowWithLastName"));
- jQuery("#addDemographicTbl #rosterStatusLbl").insertAfter(jQuery("#addDemographicTbl #firstName"));
- jQuery("#addDemographicTbl #rosterStatus").insertAfter(jQuery("#addDemographicTbl #rosterStatusLbl"));
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #genderLbl")).append(jQuery("#addDemographicTbl #gender"))).insertAfter(jQuery("#addDemographicTbl #rowWithFirstName"));
- jQuery("#addDemographicTbl #effDateLbl").insertAfter(jQuery("#addDemographicTbl #gender"));
- jQuery("#addDemographicTbl #effDate").insertAfter(jQuery("#addDemographicTbl #effDateLbl"));
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #dobLbl")).append(jQuery("#addDemographicTbl #dobTbl"))).insertAfter(jQuery("#addDemographicTbl #rowWithGender"));
- jQuery("#addDemographicTbl #renewDateLbl").insertAfter(jQuery("#addDemographicTbl #dobTbl"));
- jQuery("#addDemographicTbl #renewDate").insertAfter(jQuery("#addDemographicTbl #renewDateLbl"));
-
- jQuery("#addDemographicTbl #dobLbl").css("padding-bottom", "1em");
- jQuery("#addDemographicTbl #dobTbl").css("padding-bottom", "1em");
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #addrLbl")).append(jQuery("#addDemographicTbl #addressCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithDob"));
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #cityLbl")).append(jQuery("#addDemographicTbl #cityCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithAddress"));
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #provLbl")).append(jQuery("#addDemographicTbl #provCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithCity"));
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #postalLbl")).append(jQuery("#addDemographicTbl #postalCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithProvince"));
-
- jQuery("#addDemographicTbl #postalLbl").css("padding-bottom", "1em");
- jQuery("#addDemographicTbl #postalCell").css("padding-bottom", "1em");
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #emailLbl")).append(jQuery("#addDemographicTbl #emailCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithPostal"));
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #phoneLbl")).append(jQuery("#addDemographicTbl #phoneCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithEmail"));
- jQuery("#addDemographicTbl #ptStatusLbl").insertAfter(jQuery("#addDemographicTbl #phoneCell"));
- jQuery("#addDemographicTbl #ptStatusCell").insertAfter(jQuery("#addDemographicTbl #ptStatusLbl"));
-
- jQuery("#addDemographicTbl #phoneLbl").css("padding-bottom", "1em");
- jQuery("#addDemographicTbl #phoneCell").css("padding-bottom", "1em");
-
- jQuery("#addDemographicTbl #ptStatusLbl").css("padding-bottom", "1em");
- jQuery("#addDemographicTbl #ptStatusCell").css("padding-bottom", "1em");
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #alertLbl")).append(jQuery("#addDemographicTbl #alertCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithPhone"));
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #notesLbl")).append(jQuery("#addDemographicTbl #notesCell"))).insertAfter(jQuery("#addDemographicTbl #rowWithAlert"));
-
- jQuery("#addDemographicTbl #alertCell").attr("colspan", "3");
- jQuery("#addDemographicTbl #notesCell").attr("colspan", "3");
-
- jQuery(jQuery("
").append(jQuery("#addDemographicTbl #waitListTbl"))).insertAfter(jQuery("#addDemographicTbl #rowWithNotes"));
-
- jQuery("#addDemographicTbl #notesLbl").css("padding-bottom", "1em");
- jQuery("#addDemographicTbl #notesCell").css("padding-bottom", "1em");
-
- jQuery("#addDemographicTbl #languageLbl").css("display", "none");
- jQuery("#addDemographicTbl #languageCell").css("display", "none");
-
- jQuery("#addDemographicTbl #titleLbl").css("display", "none");
- jQuery("#addDemographicTbl #titleCell").css("display", "none");
-
- jQuery("#addDemographicTbl #spokenLbl").css("display", "none");
- jQuery("#addDemographicTbl #spokenCell").css("display", "none");
-
- jQuery("#addDemographicTbl #phoneWorkLbl").css("display", "none");
- jQuery("#addDemographicTbl #phoneWorkCell").css("display", "none");
-
- jQuery("#addDemographicTbl #phoneCellLbl").css("display", "none");
- jQuery("#addDemographicTbl #phoneCellCell").css("display", "none");
-
- jQuery("#addDemographicTbl #newsletterLbl").css("display", "none");
- jQuery("#addDemographicTbl #newsletterCell").css("display", "none");
-
- jQuery("#addDemographicTbl #myOscarLbl").css("display", "none");
- jQuery("#addDemographicTbl #myOscarCell").css("display", "none");
-
- jQuery("#addDemographicTbl #countryLbl").css("display", "none");
- jQuery("#addDemographicTbl #countryCell").css("display", "none");
-
- jQuery("#addDemographicTbl #sinNoLbl").css("display", "none");
- jQuery("#addDemographicTbl #sinNoCell").css("display", "none");
-
- jQuery("#addDemographicTbl #cytologyLbl").css("display", "none");
- jQuery("#addDemographicTbl #cytologyCell").css("display", "none");
-
- jQuery("#addDemographicTbl #demoDoctorLbl").css("display", "none");
- jQuery("#addDemographicTbl #demoDoctorCell").css("display", "none");
-
- jQuery("#addDemographicTbl #nurseLbl").css("display", "none");
- jQuery("#addDemographicTbl #nurseCell").css("display", "none");
-
- jQuery("#addDemographicTbl #midwifeLbl").css("display", "none");
- jQuery("#addDemographicTbl #midwifeCell").css("display", "none");
-
- jQuery("#addDemographicTbl #residentLbl").css("display", "none");
- jQuery("#addDemographicTbl #residentCell").css("display", "none");
-
- jQuery("#addDemographicTbl #referralDocLbl").css("display", "none");
- jQuery("#addDemographicTbl #referralDocCell").css("display", "none");
-
- jQuery("#addDemographicTbl #referralDocNoLbl").css("display", "none");
- jQuery("#addDemographicTbl #referralDocNoCell").css("display", "none");
-
- jQuery("#addDemographicTbl #rosterDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #rosterDateCell").css("display", "none");
-
- jQuery("#addDemographicTbl #joinDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #joinDateCell").css("display", "none");
-
- jQuery("#addDemographicTbl #endDateLbl").css("display", "none");
- jQuery("#addDemographicTbl #endDateCell").css("display", "none");
-
- jQuery("#addDemographicTbl #chart_no").attr("tabindex", "1");
- jQuery("#addDemographicTbl #last_name").attr("tabindex", "2");
- jQuery("#addDemographicTbl #first_name").attr("tabindex", "3");
- jQuery("#addDemographicTbl #sex").attr("tabindex", "4");
- jQuery("#addDemographicTbl #year_of_birth").attr("tabindex", "5");
- jQuery("#addDemographicTbl #month_of_birth").attr("tabindex", "6");
- jQuery("#addDemographicTbl #date_of_birth").attr("tabindex", "7");
- jQuery("#addDemographicTbl #address").attr("tabindex", "8");
- jQuery("#addDemographicTbl #city").attr("tabindex", "9");
- jQuery("#addDemographicTbl #province").attr("tabindex", "10");
- jQuery("#addDemographicTbl #postal").attr("tabindex", "11");
- jQuery("#addDemographicTbl #email").attr("tabindex", "12");
- jQuery("#addDemographicTbl #phone").attr("tabindex", "13");
- jQuery("#addDemographicTbl #hPhoneExt").attr("tabindex", "14");
- jQuery("#addDemographicTbl #hin").attr("tabindex", "15");
- jQuery("#addDemographicTbl #ver").attr("tabindex", "16");
- jQuery("#addDemographicTbl #hc_type").attr("tabindex", "17");
- jQuery("#addDemographicTbl #roster_status").attr("tabindex", "18");
- jQuery("#addDemographicTbl #eff_date_year").attr("tabindex", "19");
- jQuery("#addDemographicTbl #eff_date_month").attr("tabindex", "20");
- jQuery("#addDemographicTbl #eff_date_date").attr("tabindex", "21");
- jQuery("#addDemographicTbl #hc_renew_date_year").attr("tabindex", "22");
- jQuery("#addDemographicTbl #hc_renew_date_month").attr("tabindex", "23");
- jQuery("#addDemographicTbl #hc_renew_date_date").attr("tabindex", "24");
- jQuery("#addDemographicTbl #patient_status").attr("tabindex", "25");
- jQuery("#addDemographicTbl #cust3").attr("tabindex", "26");
- jQuery("#addDemographicTbl #content").attr("tabindex", "27");
- jQuery("#addDemographicTbl #name_list_id").attr("tabindex", "28");
- jQuery("#addDemographicTbl #waiting_list_note").attr("tabindex", "29");
- jQuery("#addDemographicTbl #waiting_list_referral_date").attr("tabindex", "30");
- jQuery("#addDemographicTbl #btnAddRecord").attr("tabindex", "31");
- jQuery("#addDemographicTbl #btnSwipeCard").attr("tabindex", "32");
- jQuery("#addDemographicTbl #btnCancel").attr("tabindex", "33");
-
- //Set Default Family Doctor change XXXXXX to provider number of default doctor
- jQuery("#addDemographicTbl #docXXXXXX").attr("selected", "selected");
-
- //Set default city (in this case, London)
- jQuery("#addDemographicTbl #city").val("London");
-
- //dont prefix phone number by default
- jQuery("#addDemographicTbl #phone").val("");
-
- jQuery("form#adddemographic").submit(function () {
-
- if (!jQuery("#addDemographicTbl #chart_no").val()) {
- alert("Student Number must be completed");
- return false;
- }
-
- if (!jQuery("#addDemographicTbl #phone").val() && !jQuery("#addDemographicTbl #email").val()) {
- alert("Either a phone number of email address must be completed");
- return false;
- }
-
- if (jQuery("#addDemographicTbl #email").val() && !isValidEmailAddress(jQuery("#addDemographicTbl #email").val())) {
- alert("Invalid email address format. Please correct");
- return false;
- }
-
- });
-
- function isValidEmailAddress(emailAddress) {
- var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
- return pattern.test(emailAddress);
- }
-
-
- jQuery("#chart_no").focus();
- jQuery("#chart_no").select();
- window.resizeTo(1250, 800);
-});
diff --git a/src/main/webapp/js/custom/westernu/billingInvoice.js b/src/main/webapp/js/custom/westernu/billingInvoice.js
deleted file mode 100644
index ab2768266ac..00000000000
--- a/src/main/webapp/js/custom/westernu/billingInvoice.js
+++ /dev/null
@@ -1,6 +0,0 @@
-jQuery(document).ready(function () {
- jQuery("#ptDemoNo").hide();
- jQuery("#ptGender").hide();
- jQuery("#ptDOB").hide();
- jQuery("#ptHin").hide();
-});
diff --git a/src/main/webapp/js/custom/westernu/billingreview.js b/src/main/webapp/js/custom/westernu/billingreview.js
deleted file mode 100644
index 1e04e10a787..00000000000
--- a/src/main/webapp/js/custom/westernu/billingreview.js
+++ /dev/null
@@ -1,23 +0,0 @@
-jQuery(document).ready(function () {
- var url = ctx + "/BillingONReview.do";
- jQuery.ajax({
- url: url,
- dataType: 'json',
- data: {method: "getDemographic", demographicNo: demographicNo},
- success: function (data) {
- jQuery("textarea#billTo").val(data.firstName + " " + data.lastName + "\n" + data.address + "\n" + data.city + ", " + data.province + "\n" + data.postal + "\nEmail: " + data.email + "\nTel: " + data.phone + "\n\nStudent ID: " + data.chartNo);
- }
-
- });
- jQuery.ajax({
- url: url,
- dataType: 'json',
- data: {method: "getClinic"},
- success: function (data) {
- jQuery("textarea#remitTo").val(data.clinicName + "\n" + data.clinicAddress + "\n" + data.clinicCity + ", " + data.clinicProvince + "\n" + data.clinicPostal + "\nTel: 519-661-2111 x11111");
- }
-
- });
- jQuery("#settlePrintBtn").css("display", "none");
-
-});
diff --git a/src/main/webapp/js/custom/westernu/master.js b/src/main/webapp/js/custom/westernu/master.js
deleted file mode 100644
index 3c1456cb63b..00000000000
--- a/src/main/webapp/js/custom/westernu/master.js
+++ /dev/null
@@ -1,2 +0,0 @@
-jQuery(document).ready(function () {
-});
diff --git a/src/main/webapp/js/hideexpand.js b/src/main/webapp/js/hideexpand.js
deleted file mode 100755
index 4fc77cdc989..00000000000
--- a/src/main/webapp/js/hideexpand.js
+++ /dev/null
@@ -1,207 +0,0 @@
-// our global vars
-var heightnow;
-var targetheight;
-var block;
-var slideinterval;
-var divheights = new Array();
-
-// the delay between the slide in/out, and a little inertia
-var inertiabase = 1;
-var inertiainc = 1;
-var slideintervalinc = 1;
-var inertiabaseoriginal = inertiabase;
-
-var closedSections = [];
-
-function getFormField() {
- return document.getElementById("closedSections");
-}
-
-function initSections() {
- var ssv = getFormField().value;
- closedSections = ssv.split(",");
- for (var i = 0; i < closedSections.length; i++) {
- var s = document.getElementById(closedSections[i]);
- if (s != null) document.getElementById(closedSections[i]).style.display = "none";
- }
-}
-
-function setup_slidey() {
-
- // detect whether the user has ie or not, how we get the height is different
- var useragent = navigator.userAgent.toLowerCase();
- var ie = ((useragent.indexOf('msie') != -1) && (useragent.indexOf('opera') == -1) && (useragent.indexOf('webtv') == -1));
- var divs = getElementsByClassName(document, "div", "slideblock");
-
- for (var i = 0; i < divs.length; i++) {
- // get the original height
- var baseheight = (ie) ? divs[i].offsetHeight + "px" : document.defaultView.getComputedStyle(divs[i], null).getPropertyValue('height', null);
-
- // explicitly display it (optional, you could use cookies to toggle whether to display it or not)
- divs[i].style.display = "block";
-
- // "save" our div height, because once it's display is set to none we can't get the original height again
- var d = new div();
- d.el = divs[i];
- d.ht = baseheight.substring(0, baseheight.indexOf("p"));
-
- // store our saved versoin
- divheights[i] = d;
- }
-
- initSections();
-
- touchColor();
-}
-
-// this is one of our divs, it just has a DOM reference to the element and the original height
-function div(_el, _ht) {
- this.el = _el;
- this.ht = _ht;
-}
-
-// this is our slidein function the interval uses, it keeps subtracting
-// from the height till it's 1px then it hides it
-function slidein() {
- if (heightnow > targetheight) {
- // reduce the height by intertiabase * inertiainc
- heightnow -= inertiabase;
-
- // increase the intertiabase by the amount to keep it changing
- inertiabase += inertiainc;
-
- // it's possible to exceed the height we want so we use a ternary - (condition) ? when true : when false;
- block.style.height = (heightnow > 1) ? heightnow + "px" : targetheight + "px";
- } else {
- // finished, so hide the div properly and kill the interval
- clearInterval(slideinterval);
- block.style.display = "none";
- }
-}
-
-// this is the function our slideout interval uses, it keeps adding
-// to the height till it's fully displayed
-function slideout() {
- if (heightnow < targetheight) {
- // increases the height by the inertia stuff
- heightnow += inertiabase;
-
- // increase the inertia stuff
- inertiabase += inertiainc;
-
- // it's possible to exceed the height we want so we use a ternary - (condition) ? when true : when false;
- block.style.height = (heightnow < targetheight) ? heightnow + "px" : targetheight + "px";
-
- } else {
- // finished, so make sure the height is what it's meant to be (inertia can make it off a little)
- // then kill the interval
- clearInterval(slideinterval);
- block.style.height = targetheight + "px";
- }
-}
-
-// returns the height of the div from our array of such things
-function divheight(d) {
- for (var i = 0; i < divheights.length; i++) {
- if (divheights[i].el == d) {
- return divheights[i].ht;
- }
- }
-}
-
-/*
- the getElementsByClassName function I pilfered from this guy. It's
- a useful function that'll return any/all tags with a specific css class.
-
- Written by Jonathan Snook, http://www.snook.ca/jonathan
- Add-ons by Robert Nyman, http://www.robertnyman.com
-*/
-function getElementsByClassName(oElm, strTagName, strClassName) {
- // first it gets all of the specified tags
- var arrElements = (strTagName == "*" && document.all) ? document.all : oElm.getElementsByTagName(strTagName);
-
- // then it sets up an array that'll hold the results
- var arrReturnElements = new Array();
-
- // some regex stuff you don't need to worry about
- strClassName = strClassName.replace(/\-/g, "\\-");
-
- var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)");
- var oElement;
-
- // now it iterates through the elements it grabbed above
- for (var i = 0; i < arrElements.length; i++) {
- oElement = arrElements[i];
-
- // if the class matches what we're looking for it ads to the results array
- if (oRegExp.test(oElement.className)) {
- arrReturnElements.push(oElement);
- }
- }
-
- // then it kicks the results back to us
- return (arrReturnElements)
-}
-
-function togglediv(t) {
-
- // reset our inertia base and interval
- inertiabase = inertiabaseoriginal;
- clearInterval(slideinterval);
-
- // get our block
- block = t.parentNode.nextSibling;
-
- // for mozilla, it doesn't like whitespace between elements
- if (block.className == undefined)
- block = t.parentNode.nextSibling.nextSibling;
-
- if (block.style.display == "none") {
- // link text
- // t.innerHTML = "Hide";
- for (var i = 0; i < closedSections.length; i++)
- if (closedSections[i] == block.id)
- closedSections.splice(i, 1);
- getFormField().value = closedSections.join(",");
-
- block.style.display = "block";
- block.style.height = "1px";
-
- // our goal and current height
- targetheight = divheight(block);
- heightnow = 1;
-
- // our interval
- slideinterval = setInterval(slideout, slideintervalinc);
- } else {
- // linkstext
- // t.innerHTML = "Show";
- closedSections.push(block.id);
- getFormField().value = closedSections.join(",");
-
- // our goal and current height
- targetheight = 1;
- heightnow = divheight(block);
-
- // our interval
- slideinterval = setInterval(slidein, slideintervalinc);
- }
-}
-
-function expandAll() {
- var divs = getElementsByClassName(document, "div", "slideblock");
- for (var i = 0; i < divs.length; i++) {
- divs[i].style.height = divheight(divs[i]);
- divs[i].style.display = "block";
- }
- getFormField().value = "";
-}
-
-function collapseAll() {
- var divs = getElementsByClassName(document, "div", "slideblock");
- getFormField().value = "";
- for (var i = 0; i < divs.length; i++) {
- divs[i].style.display = "none";
- getFormField().value += divs[i].id + ",";
- }
-}
diff --git a/src/main/webapp/js/oscarRx.js b/src/main/webapp/js/oscarRx.js
deleted file mode 100644
index 48ca48f602d..00000000000
--- a/src/main/webapp/js/oscarRx.js
+++ /dev/null
@@ -1,1633 +0,0 @@
-/*
- *
- * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
- * This software is published under the GPL GNU General Public License.
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- *
- *
- *
- * This software was written for the
- * Department of Family Medicine
- * McMaster University
- * Hamilton
- * Ontario, Canada
- */
-
-function saveLinks(randNumber) {
- $('method_' + randNumber).onblur();
- $('route_' + randNumber).onblur();
- $('frequency_' + randNumber).onblur();
- $('minimum_' + randNumber).onblur();
- $('maximum_' + randNumber).onblur();
- $('duration_' + randNumber).onblur();
- $('durationUnit_' + randNumber).onblur();
-}
-
-
-function handleEnter(inField, ev) {
- var charCode;
- if (ev && ev.which)
- charCode = ev.which;
- else if (window.event) {
- ev = window.event;
- charCode = ev.keyCode;
- }
- var id = inField.id.split("_")[1];
- if (charCode == 13)
- showHideSpecInst('siAutoComplete_' + id);
-}
-
-//has to be in here, not prescribe.jsp for it to work in IE 6/7 and probably 8.
-function showHideSpecInst(elementId) {
- alert(elementId);
- if ($(elementId).is(":visible")) {
- $(elementId).hide("fold", 1000);
- } else {
- $(elementId).show("fold", 1000);
- }
-}
-
-function resetReRxDrugList() {
- var rand = Math.floor(Math.random() * 10001);
- var url = ctx + "/oscarRx/deleteRx.do?parameterValue=clearReRxDrugList";
- var data = "rand=" + rand;
- new Ajax.Request(url, {
- method: 'post', parameters: data, onSuccess: function (transport) {
- }
- });
-}
-
-function onPrint(cfgPage) {
- var docF = $('printFormDD');
-
- docF.action = "../form/createpdf?__title=Rx&__cfgfile=" + cfgPage + "&__template=a6blank";
- docF.target = "_blank";
- docF.submit();
- return true;
-}
-
-function buildRoute() {
-
- pickRoute = "";
-}
-
-
-function popupRxSearchWindow() {
- var winX = (document.all) ? window.screenLeft : window.screenX;
- var winY = (document.all) ? window.screenTop : window.screenY;
-
- var top = winY + 70;
- var left = winX + 110;
- var url = "searchDrug.do?rx2=true&searchString=" + $('searchString').value;
- popup2(600, 800, top, left, url, 'windowNameRxSearch<%=demoNo%>');
-
-}
-
-
-function popupRxReasonWindow(demographic, id) {
- var winX = (document.all) ? window.screenLeft : window.screenX;
- var winY = (document.all) ? window.screenTop : window.screenY;
-
- var top = winY + 70;
- var left = winX + 110;
- var url = "SelectReason.jsp?demographicNo=" + demographic + "&drugId=" + id;
- popup2(575, 650, top, left, url, 'windowNameRxReason<%=demoNo%>');
-
-}
-
-
-var highlightMatch = function (full, snippet, matchindex) {
- return "" + full.substring(0, matchindex) +
- "" + full.substr(matchindex, snippet.length) + "" + full.substring(matchindex + snippet.length) + "";
-};
-
-var highlightMatchInactiveMatchWord = function (full, snippet, matchindex) {
- //oscarLog(full+"--"+snippet+"--"+matchindex);
- return "" + "" + full.substring(0, matchindex) +
- "" + full.substr(matchindex, snippet.length) + "" + full.substring(matchindex + snippet.length) + "" + "";
-};
-var highlightMatchInactive = function (full, snippet, matchindex) {
- /* oscarLog(full+"--"+snippet+"--"+matchindex);
- oscarLog(" aa "+full.substring(0, matchindex) );
- oscarLog(" bb "+full.substr(matchindex, snippet.length) );
- oscarLog(" cc "+ full.substring(matchindex + snippet.length));*/
- /*return ""+""+full.substring(0, matchindex) +
- full.substr(matchindex, snippet.length) +full.substring(matchindex + snippet.length)+""+"";*/
- return "" + "" + full + "" + "";
-};
-var resultFormatter = function (oResultData, sQuery, sResultMatch) {
- //oscarLog("oResultData, sQuery, sResultMatch="+oResultData+"--"+sQuery+"--"+sResultMatch);
- //oscarLog("oResultData[0]="+oResultData[0]);
- //oscarLog("oResultData.name="+oResultData.name);
- //oscarLog("oResultData.name="+oResultData.id);
- var query = sQuery.toUpperCase();
- var drugName = oResultData[0];
-
- var mIndex = drugName.toUpperCase().indexOf(query);
- var display = '';
-
- if (mIndex > -1) {
- display = highlightMatch(drugName, query, mIndex);
- } else {
- display = drugName;
- }
- return display;
-};
-
-var resultFormatter2 = function (oResultData, sQuery, sResultMatch) {
- /*oscarLog("oResultData, sQuery, sResultMatch="+oResultData+"--"+sQuery+"--"+sResultMatch);
- oscarLog("oResultData[0]="+oResultData[0]);
- oscarLog("oResultData.name="+oResultData.name);
- oscarLog("oResultData.name="+oResultData.id);*/
- var query = sQuery.toUpperCase();
- var drugName = oResultData.name;
- var isInactive = oResultData.isInactive;
- //oscarLog("isInactive="+isInactive);
-
- var mIndex = drugName.toUpperCase().indexOf(query);
- var display = '';
- if (mIndex > -1 && (isInactive == 'true' || isInactive == true)) { //match and inactive
- display = highlightMatchInactiveMatchWord(drugName, query, mIndex);
- } else if (mIndex > -1 && (isInactive == 'false' || isInactive == false || isInactive == undefined || isInactive == null)) { //match and active
- display = highlightMatch(drugName, query, mIndex);
- } else if (mIndex <= -1 && (isInactive == 'true' || isInactive == true)) {//no match and inactive
- display = highlightMatchInactive(drugName, query, mIndex);
- } else {//active and no match
- display = drugName;
- }
- return display;
-};
-
-
-addEvent(window, "load", sortables_init);
-
-var SORT_COLUMN_INDEX;
-
-function sortables_init() {
- // Find all tables with class sortable and make them sortable
-
- if (!document.getElementsByTagName) return;
-
- tbls = document.getElementsByTagName("table");
-
- for (ti = 0; ti < tbls.length; ti++) {
- thisTbl = tbls[ti];
-
- if (((' ' + thisTbl.className + ' ').indexOf("sortable") != -1) && (thisTbl.id)) {
- //initTable(thisTbl.id);
- ts_makeSortable(thisTbl);
- }
- }
-}
-
-function ts_makeSortable(table) {
- oscarLog('making ' + table + ' sortable');
- if (table.rows && table.rows.length > 0) {
- var firstRow = table.rows[0];
- }
- if (!firstRow) return;
- oscarLog('Gets past here');
-
- // We have a first row: assume it's the header, and make its contents clickable links
- for (var i = 0; i < firstRow.cells.length; i++) {
- var cell = firstRow.cells[i];
- var txt = ts_getInnerText(cell);
- cell.innerHTML = '';
- }
-}
-
-function ts_getInnerText(el) {
- if (typeof el == "string") return el;
- if (typeof el == "undefined") {
- return el
- }
- ;
- if (el.innerText) return el.innerText; //Not needed but it is faster
- var str = "";
-
- var cs = el.childNodes;
- var l = cs.length;
- for (var i = 0; i < l; i++) {
- switch (cs[i].nodeType) {
- case 1: //ELEMENT_NODE
- str += ts_getInnerText(cs[i]);
- break;
- case 3: //TEXT_NODE
- str += cs[i].nodeValue;
- break;
- }
- }
- return str;
-}
-
-function ts_resortTable(lnk, clid) {
- // get the span
- var span;
- for (var ci = 0; ci < lnk.childNodes.length; ci++) {
- if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
- }
- var spantext = ts_getInnerText(span);
- var td = lnk.parentNode;
- var column = clid;
- var table = getParent(td, 'TABLE');
-
- // Work out a type for the column
- if (table.rows.length <= 1) return;
-
-
- var itm = ts_getInnerText(table.rows[1].cells[column]).trim();
- sortfn = ts_sort_caseinsensitive;
- if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
- if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
- if (itm.match(/^[£$]/)) sortfn = ts_sort_currency;
- if (itm.match(/^[\d\.]+$/)) sortfn = ts_sort_numeric;
- SORT_COLUMN_INDEX = column;
- var firstRow = new Array();
- var newRows = new Array();
- for (i = 0; i < table.rows[0].length; i++) {
- firstRow[i] = table.rows[0][i];
- }
- for (j = 1; j < table.rows.length; j++) {
- newRows[j - 1] = table.rows[j];
- }
-
- newRows.sort(sortfn);
-
- if (span.getAttribute("sortdir") == 'down') {
- ARROW = ' ↑';
- newRows.reverse();
- span.setAttribute('sortdir', 'up');
- } else {
- ARROW = ' ↓';
- span.setAttribute('sortdir', 'down');
- }
-
- // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
- // don't do sortbottom rows
- for (i = 0; i < newRows.length; i++) {
- if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) table.tBodies[0].appendChild(newRows[i]);
- }
- // do sortbottom rows only
- for (i = 0; i < newRows.length; i++) {
- if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1)) table.tBodies[0].appendChild(newRows[i]);
- }
-
- // Delete any other arrows there may be showing
- var allspans = document.getElementsByTagName("span");
- for (var ci = 0; ci < allspans.length; ci++) {
- if (allspans[ci].className == 'sortarrow') {
- if (getParent(allspans[ci], "table") == getParent(lnk, "table")) { // in the same table as us?
- allspans[ci].innerHTML = '';
- }
- }
- }
-
- span.innerHTML = ARROW;
-}
-
-function getParent(el, pTagName) {
- if (el == null) return null;
- else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) // Gecko bug, supposed to be uppercase
- return el;
- else
- return getParent(el.parentNode, pTagName);
-}
-
-function ts_sort_date(a, b) {
- // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
- if (aa.length == 10) {
- dt1 = aa.substr(6, 4) + aa.substr(3, 2) + aa.substr(0, 2);
- } else {
- yr = aa.substr(6, 2);
- if (parseInt(yr) < 50) {
- yr = '20' + yr;
- } else {
- yr = '19' + yr;
- }
- dt1 = yr + aa.substr(3, 2) + aa.substr(0, 2);
- }
- if (bb.length == 10) {
- dt2 = bb.substr(6, 4) + bb.substr(3, 2) + bb.substr(0, 2);
- } else {
- yr = bb.substr(6, 2);
- if (parseInt(yr) < 50) {
- yr = '20' + yr;
- } else {
- yr = '19' + yr;
- }
- dt2 = yr + bb.substr(3, 2) + bb.substr(0, 2);
- }
- if (dt1 == dt2) return 0;
- if (dt1 < dt2) return -1;
- return 1;
-}
-
-function ts_sort_currency(a, b) {
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g, '');
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).replace(/[^0-9.]/g, '');
- return parseFloat(aa) - parseFloat(bb);
-}
-
-function ts_sort_numeric(a, b) {
- aa = parseFloat(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
- if (isNaN(aa)) aa = 0;
- bb = parseFloat(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
- if (isNaN(bb)) bb = 0;
- return aa - bb;
-}
-
-function ts_sort_caseinsensitive(a, b) {
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
- if (aa == bb) return 0;
- if (aa < bb) return -1;
- return 1;
-}
-
-function ts_sort_default(a, b) {
- aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
- bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
- if (aa == bb) return 0;
- if (aa < bb) return -1;
- return 1;
-}
-
-
-function addEvent(elm, evType, fn, useCapture)
-// addEvent and removeEvent
-// cross-browser event handling for IE5+, NS6 and Mozilla
-// By Scott Andrew
-{
- if (elm.addEventListener) {
- elm.addEventListener(evType, fn, useCapture);
- return true;
- } else if (elm.attachEvent) {
- var r = elm.attachEvent("on" + evType, fn);
- return r;
- } else {
- alert("Handler could not be removed");
- }
-}
-
-function checkFav() {
- //oscarLog("****** in checkFav");
- var usefav = '<%=usefav%>';
- var favid = '<%=favid%>';
- if (usefav == "true" && favid != null && favid != 'null') {
- //oscarLog("****** favid "+favid);
- useFav2(favid);
- } else {
- }
-}
-
-//not used , represcribe a drug
-function represcribeOnLoad(drugId) {
- var data = "drugId=" + drugId + "&rand=" + Math.floor(Math.random() * 10001);
- var url = ctx + "/oscarRx/rePrescribe2.do?method=saveReRxDrugIdToStash";
- new Ajax.Updater('rxText', url, {
- method: 'get', parameters: data, evalScripts: true, insertion: Insertion.Bottom,
- onSuccess: function (transport) {
- }
- });
-
-}
-
-
-function moveDrugDown(drugId, swapDrugId, demographicNo) {
- new Ajax.Request(ctx + '/oscarRx/reorderDrug.do?method=update&direction=down&drugId=' + drugId + '&swapDrugId=' + swapDrugId + '&demographicNo=' + demographicNo + "&rand=" + Math.floor(Math.random() * 10001), {
- method: 'get',
- onSuccess: function (transport) {
- callReplacementWebService("ListDrugs.jsp", 'drugProfile');
- resetReRxDrugList();
- resetStash();
- }
- });
-}
-
-function moveDrugUp(drugId, swapDrugId, demographicNo) {
- new Ajax.Request(ctx + '/oscarRx/reorderDrug.do?method=update&direction=up&drugId=' + drugId + '&swapDrugId=' + swapDrugId + '&demographicNo=' + demographicNo + "&rand=" + Math.floor(Math.random() * 10001), {
- method: 'get',
- onSuccess: function (transport) {
- callReplacementWebService("ListDrugs.jsp", 'drugProfile');
- resetReRxDrugList();
- resetStash();
- }
- });
-}
-
-function showPreviousPrints(scriptNo) {
- popupWindow(720, 700, 'ShowPreviousPrints.jsp?scriptNo=' + scriptNo, 'ShowPreviousPrints')
-}
-
-
-/**/
-
-function toggleStartDateUnknown(rand) {
- var cb = document.getElementById('startDateUnknown_' + rand);
- var txt = document.getElementById('rxDate_' + rand);
- if (cb.checked) {
-
- txt.disabled = true;
- txt.value = new Date();
- } else {
- txt.disabled = false;
- }
-}
-
-function emptyWrittenDate(rand) {
- var cb = document.getElementById('pastMed_' + rand);
- var txt = document.getElementById('writtenDate_' + rand);
-
- if (cb.checked) {
- txt.value = '0001-01-01';
- txt.disabled = true;
- } else {
- txt.disabled = false;
-
- }
-
-}
-
-//this is a SJHH specific feature
-function completeMedRec() {
- var ok = confirm("Are you sure you would like to mark the Med Rec as complete?");
- if (ok) {
- var url = ctx + "/oscarRx/completeMedRec.jsp?demographicNo=<%=bean.getDemographicNo()%>";
- var data;
- new Ajax.Request(url, {
- method: 'get', parameters: data, onSuccess: function (transport) {
- alert('Completed.')
- }
- });
- }
-}
-
-
-function changeLt(drugId) {
- if (confirm('') == true) {
- var data = "ltDrugId=" + drugId + "&rand=" + Math.floor(Math.random() * 10001);
- var url = ctx + "/oscarRx/WriteScript.do?parameterValue=changeToLongTerm";
- new Ajax.Request(url, {
- method: 'post', parameters: data, onSuccess: function (transport) {
- var json = transport.responseText.evalJSON();
- if (json != null && (json.success == 'true' || json.success == true)) {
- $("notLongTermDrug_" + drugId).innerHTML = "*";
- $("notLongTermDrug_" + drugId).setStyle({
- textDecoration: 'none',
- color: 'red'
- });
- $("notLongTermDrug_" + drugId).setAttribute("onclick", "");
- $("notLongTermDrug_" + drugId).setAttribute("href", "");
- } else {
- }
- }
- });
- }
-}
-
-function checkReRxLongTerm() {
- var url = window.location.href;
- var match = url.indexOf('ltm=true');
- if (match > -1) {
- RePrescribeLongTerm();
- }
-}
-
-function changeContainerHeight(ele) {
- var ss = $('searchString').value;
- ss = trim(ss);
- if (ss.length == 0)
- $('autocomplete_choices').setStyle({height: '0%'});
- else
- $('autocomplete_choices').setStyle({height: '100%'});
-}
-
-function addInstruction(content, randomId) {
- $('instructions_' + randomId).value = content;
- parseIntr($('instructions_' + randomId));
-}
-
-function addSpecialInstruction(content, randomId) {
- if ($('siAutoComplete_' + randomId).getStyle('display') == 'none') {
- Effect.BlindDown('siAutoComplete_' + randomId);
- } else {
- }
- $('siInput_' + randomId).value = content;
- $('siInput_' + randomId).setStyle({color: 'black'});
-}
-
-function hideMedHistory() {
- mb.hide();
-}
-
-var modalBox = function () {
- this.show = function (randomId, displaySRC, H) {
- if (!document.getElementById("xmaskframe")) {
- var divFram = document.createElement('iframe');
- divFram.setAttribute("id", "xmaskframe");
- divFram.setAttribute("name", "xmaskframe");
- //divFram.setAttribute("src","displayMedHistory.jsp?randomId="+randomId);
- divFram.setAttribute("allowtransparency", "false");
- document.body.appendChild(divFram);
- var divSty = document.getElementById("xmaskframe").style;
- divSty.position = "fixed";
- divSty.top = "0px";
- divSty.right = "0px";
- divSty.width = "390px"
- //divSty.border="solid";
- divSty.backgroundColor = "#F5F5F5";
- divSty.zIndex = "45";
- //divSty.cursor="move";
- }
- this.waitifrm = document.getElementById("xmaskframe");
-
- this.waitifrm.setAttribute("src", displaySRC + ".jsp?randomId=" + randomId);
- this.waitifrm.style.display = "block";
- this.waitifrm.style.height = H;
-
- $("dragifm").appendChild(this.waitifrm);
- Effect.Appear('xmaskframe');
- };
- this.hide = function () {
- Effect.Fade('xmaskframe');
-
- };
-}
-var mb = new modalBox();
-
-function displayMedHistory(randomId) {
- var data = "randomId=" + randomId;
- new Ajax.Request(ctx + "/oscarRx/WriteScript.do?parameterValue=listPreviousInstructions",
- {
- method: 'post', parameters: data, asynchronous: false, onSuccess: function (transport) {
- mb.show(randomId, 'displayMedHistory', '200px');
- }
- });
-}
-
-function displayInstructions(randomId) {
- var data = "randomId=" + randomId;
- mb.show(randomId, 'displayInstructions', '600px');
-
-}
-
-function updateProperty(elementId) {
- var randomId = elementId.split("_")[1];
- if (randomId != null) {
- var url = ctx + "/oscarRx/WriteScript.do?parameterValue=updateProperty";
- var data = "";
- if (elementId.match("prnVal_") != null)
- data = "elementId=" + elementId + "&propertyValue=" + $(elementId).value;
- else
- data = "elementId=" + elementId + "&propertyValue=" + $(elementId).innerHTML;
- data = data + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {method: 'post', parameters: data});
- }
-}
-
-function lookNonEdittable(elementId) {
- $(elementId).className = '';
-}
-
-function lookEdittable(elementId) {
- $(elementId).className = 'highlight';
-}
-
-function setPrn(randomId) {
- var prnStr = $('prn_' + randomId).innerHTML;
- prnStr = prnStr.strip();
- var prnStyle = $('prn_' + randomId).getStyle('textDecoration');
- if (prnStr == 'prn' || prnStr == 'PRN' || prnStr == 'Prn') {
- if (prnStyle.match("line-through") != null) {
- $('prn_' + randomId).setStyle({textDecoration: 'none'});
- $('prnVal_' + randomId).value = true;
- } else {
- $('prn_' + randomId).setStyle({textDecoration: 'line-through'});
- $('prnVal_' + randomId).value = false;
- }
- }
-}
-
-function focusTo(elementId) {
- $(elementId).contentEditable = 'true';
- $(elementId).focus();
- //IE 6/7 bug..will this call onfocus twice?? may need to do browser check.
- document.getElementById(elementId).onfocus();
-
-}
-
-function updateSpecialInstruction(elementId) {
- var randomId = elementId.split("_")[1];
- var url = ctx + "/oscarRx/WriteScript.do?parameterValue=updateSpecialInstruction";
- var data = "randomId=" + randomId + "&specialInstruction=" + $(elementId).value;
- data = data + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {method: 'post', parameters: data});
-}
-
-function changeText(elementId) {
- if ($(elementId).value == 'Enter Special Instruction') {
- $(elementId).value = "";
- $(elementId).setStyle({color: 'black'});
- } else if ($(elementId).value == '') {
- $(elementId).value = 'Enter Special Instruction';
- $(elementId).setStyle({color: 'gray'});
- }
-
-}
-
-function updateMoreLess(elementId) {
- if ($(elementId).innerHTML == 'more')
- $(elementId).innerHTML = 'less';
- else
- $(elementId).innerHTML = 'more';
-}
-
-function changeDrugName(randomId, origDrugName) {
- if (confirm('If you change the drug name and write your own drug, you will lose the following functionality:'
- + '\n * Known Dosage Forms / Routes'
- + '\n * Drug Allergy Information'
- + '\n * Drug-Drug Interaction Information'
- + '\n * Drug Information'
- + '\n\nAre you sure you wish to use this feature?') == true) {
-
- //call another function to bring up prescribe.jsp
- var url = ctx + "/oscarRx/WriteScript.do?parameterValue=normalDrugSetCustom";
- var customDrugName = $("drugName_" + randomId).getValue();
- var data = "randomId=" + randomId + "&customDrugName=" + customDrugName;
- new Ajax.Updater('rxText', url, {
- method: 'get',
- parameters: data,
- asynchronous: true,
- insertion: Insertion.Bottom,
- onSuccess: function (transport) {
- $('set_' + randomId).remove();
-
- }
- });
-
- if (MYDRUGREF_DS == "yes") {
- callReplacementWebService("GetmyDrugrefInfo.do?method=view", 'interactionsRxMyD');
- }
- } else {
- $("drugName_" + randomId).value = origDrugName;
- }
-}
-
-function resetStash() {
- var url = ctx + "/oscarRx/deleteRx.do?parameterValue=clearStash";
- var data = "rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {
- method: 'post', parameters: data, onSuccess: function (transport) {
- updateCurrentInteractions();
- }
- });
- $('rxText').innerHTML = "";//make pending prescriptions disappear.
- $("searchString").focus();
-}
-
-function iterateStash() {
- var url = ctx + "/oscarRx/WriteScript.do?parameterValue=iterateStash";
- var data = "rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Updater('rxText', url, {
- method: 'get', parameters: data, asynchronous: true, evalScripts: true,
- insertion: Insertion.Bottom, onSuccess: function (transport) {
- updateCurrentInteractions();
- }
- });
-
-}
-
-function rxPageSizeSelect() {
- var ran_number = Math.round(Math.random() * 1000000);
- var url = "GetRxPageSizeInfo.do?method=view";
- var params = "demographicNo=<%=demoNo%>&rand=" + ran_number; //hack to get around ie caching the page
- new Ajax.Request(url, {method: 'post', parameters: params});
-}
-
-function reprint2(scriptNo) {
- var data = "scriptNo=" + scriptNo + "&rand=" + Math.floor(Math.random() * 10001);
- var url = ctx + "/oscarRx/rePrescribe2.do?method=reprint2";
- new Ajax.Request(url,
- {
- method: 'post', postBody: data,
- onSuccess: function (transport) {
- popForm2(scriptNo);
-
- }
- });
- return false;
-}
-
-
-function deletePrescribe(randomId) {
- var data = "randomId=" + randomId;
- var url = ctx + "/oscarRx/rxStashDelete.do?parameterValue=deletePrescribe";
- new Ajax.Request(url, {
- method: 'get', parameters: data, onSuccess: function (transport) {
- updateCurrentInteractions();
- if ($('deleteOnCloseRxBox').value == 'true') {
- deleteRxOnCloseRxBox(randomId);
- }
- }
- });
-}
-
-function deleteRxOnCloseRxBox(randomId) {
-
- var data = "randomId=" + randomId;
- var url = ctx + "/oscarRx/deleteRx.do?parameterValue=DeleteRxOnCloseRxBox";
- new Ajax.Request(url, {
- method: 'get', parameters: data, onSuccess: function (transport) {
- var json = transport.responseText.evalJSON();
- if (json != null) {
- var id = json.drugId;
- var rxDate = "rxDate_" + id;
- var reRx = "reRx_" + id;
- var del = "del_" + id;
- var discont = "discont_" + id;
- var prescrip = "prescrip_" + id;
- $(rxDate).style.textDecoration = 'line-through';
- $(reRx).style.textDecoration = 'line-through';
- $(del).style.textDecoration = 'line-through';
- $(discont).style.textDecoration = 'line-through';
- $(prescrip).style.textDecoration = 'line-through';
- }
- }
- });
-
-}
-
-function ThemeViewer() {
-
- var xy = Position.page($('drugProfile'));
- var x = (xy[0] + 200) + 'px';
- var y = xy[1] + 'px';
- var wid = ($('drugProfile').getWidth() - 300) + 'px';
- var styleStr = {left: x, top: y, width: wid};
-
- $('themeLegend').setStyle(styleStr);
- $('themeLegend').show();
-}
-
-function useFav2(favoriteId) {
- var randomId = Math.round(Math.random() * 1000000);
- var data = "favoriteId=" + favoriteId + "&randomId=" + randomId;
- var url = ctx + "/oscarRx/useFavorite.do?parameterValue=useFav2";
- new Ajax.Updater('rxText', url, {
- method: 'get',
- parameters: data,
- asynchronous: true,
- evalScripts: true,
- insertion: Insertion.Bottom
- });
-}
-
-function calculateRxData(randomId) {
- var dummie = parseIntr($('instructions_' + randomId));
- if (dummie)
- updateQty($('quantity_' + randomId));
-}
-
-function Delete2(element) {
-
- if (confirm('Are you sure you wish to delete the selected prescriptions?') == true) {
- var id_str = (element.id).split("_");
- var id = id_str[1];
- //var id=element.id;
- var rxDate = "rxDate_" + id;
- var reRx = "reRx_" + id;
- var del = "del_" + id;
- var discont = "discont_" + id;
- var prescrip = "prescrip_" + id;
-
- var url = ctx + "/oscarRx/deleteRx.do?parameterValue=Delete2";
- var data = "deleteRxId=" + element.id + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {
- method: 'post', postBody: data, onSuccess: function (transport) {
- $(rxDate).style.textDecoration = 'line-through';
- $(reRx).style.textDecoration = 'line-through';
- $(del).style.textDecoration = 'line-through';
- $(discont).style.textDecoration = 'line-through';
- $(prescrip).style.textDecoration = 'line-through';
- }
- });
- }
- return false;
-}
-
-function checkAllergy(id, atcCode) {
- var url = ctx + "/oscarRx/getAllergyData.jsp";
- var data = "atcCode=" + atcCode + "&id=" + id + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {
- method: 'post', postBody: data, onSuccess: function (transport) {
- var json = transport.responseText.evalJSON();
- if (json != null && json.DESCRIPTION != null && json.reaction != null) {
- var str = "Allergy: " + json.DESCRIPTION + " Reaction: " + json.reaction + " Severity of Reaction: " + json.severity;
- $('alleg_' + json.id).innerHTML = str;
- document.getElementById('alleg_tbl_' + json.id).style.display = 'block';
- }
- }
- });
-}
-
-function checkIfInactive(id, dinNumber) {
- var url = ctx + "/oscarRx/getInactiveDate.jsp";
- var data = "din=" + dinNumber + "&id=" + id + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {
- method: 'post', postBody: data, onSuccess: function (transport) {
- var json = transport.responseText.evalJSON();
- if (json != null) {
- var str = "Inactive Drug Since: " + new Date(json.vec[0].time).toDateString();
- $('inactive_' + json.id).innerHTML = str;
- }
- }
- });
-}
-
-
-function Discontinue(event, element) {
- var id_str = (element.id).split("_");
- var id = id_str[1];
- var widVal = ($('drugProfile').getWidth() - 300);
- var widStr = widVal + 'px';
- var heightDrugProfile = $('discontinueUI').getHeight();
- var posx = 0, posy = 0;
- if (event.pageX || event.pageY) {
- posx = event.pageX;
- posx = posx - widVal;
- posy = event.pageY - heightDrugProfile / 2;
- posx = posx + 'px';
- posy = posy + 'px';
- } else if (event.clientX || event.clientY) {
- posx = event.clientX + document.body.scrollLeft
- + document.documentElement.scrollLeft;
- posx = posx - widVal;
- posy = event.clientY + document.body.scrollTop
- + document.documentElement.scrollTop - heightDrugProfile / 2;
- posx = posx + 'px';
- posy = posy + 'px';
- } else {
- var xy = Position.page($('drugProfile'));
- posx = (xy[0] + 200) + 'px';
- if (xy[1] >= 0)
- posy = xy[1] + 'px';
- else
- posy = 0 + 'px';
- }
- var styleStr = {left: posx, top: posy, width: widStr};
-
- var drugName = $('prescrip_' + id).innerHTML;
- $('discontinueUI').setStyle(styleStr);
- $('disDrug').innerHTML = drugName;
- $('discontinueUI').show();
- $('disDrugId').value = id;
-
-
-}
-
-function Discontinue2(id, reason, comment, drugSpecial) {
- var url = ctx + "/oscarRx/deleteRx.do?parameterValue=Discontinue";
- var demoNo = '<%=patient.getDemographicNo()%>';
- var data = "drugId=" + id + "&reason=" + reason + "&comment=" + comment + "&demoNo=" + demoNo + "&drugSpecial=" + drugSpecial + "&rand=" + Math.floor(Math.random() * 10001);
- new Ajax.Request(url, {
- method: 'post', postBody: data, onSuccess: function (transport) {
- var json = transport.responseText.evalJSON();
- $('discontinueUI').hide();
- $('rxDate_' + json.id).style.textDecoration = 'line-through';
- $('reRx_' + json.id).style.textDecoration = 'line-through';
- $('del_' + json.id).style.textDecoration = 'line-through';
- $('discont_' + json.id).innerHTML = json.reason;
- $('prescrip_' + json.id).style.textDecoration = 'line-through';
- }
- });
-
-}
-
-function updateCurrentInteractions() {
- new Ajax.Request("GetmyDrugrefInfo.do?method=findInteractingDrugList&rand=" + Math.floor(Math.random() * 10001), {
- method: 'get', onSuccess: function (transport) {
- new Ajax.Request("UpdateInteractingDrugs.jsp?rand=" + Math.floor(Math.random() * 10001), {
- method: 'get', onSuccess: function (transport) {
- var str = transport.responseText;
- str = str.replace('