Index: trunk/webapps/einotebook/roles/index.html
===================================================================
--- trunk/webapps/einotebook/roles/index.html (revision 548)
+++ trunk/webapps/einotebook/roles/index.html (revision 551)
@@ -9,10 +9,10 @@
- Script
+ Roles
-
+
-
Index: trunk/webapps/einotebook/roles/roles.js
===================================================================
--- trunk/webapps/einotebook/roles/roles.js (revision 540)
+++ trunk/webapps/einotebook/roles/roles.js (revision 551)
@@ -49,4 +49,7 @@
function highlightLatestEvent()
{
+ // workaround for defect #212 is disable this function
+ return;
+
Roles.events.setEmphasis(); // Set text colors on all events
@@ -69,6 +72,8 @@
Roles.incidents = theIncidents;
Roles.events = theEvents;
- Roles.events.win = document.getElementById("view").contentWindow;
- Roles.events.doc = getDocumentFromFrame('view');
+ // workaround for defect #212 is delete these two lines so they don't conflict
+ // with the Scripts.events.win
+ //Roles.events.win = document.getElementById("view").contentWindow;
+ //Roles.events.doc = getDocumentFromFrame('view');
// reset SELECT box to default value
document.getElementById("desiredRole").value = "TELEPHONE CONVERSATION";
@@ -108,5 +113,5 @@
// display events in iframe
- getDocumentFromFrame('view').body.innerHTML = html;
+ getDocumentFromFrame('rolesview').body.innerHTML = html;
// resize iframe to appropriate height
@@ -150,7 +155,7 @@
{
var height = document.documentElement.clientHeight;
- height -= pageY(document.getElementById('view'));
+ height -= pageY(document.getElementById('rolesview'));
height = (height < 0) ? 0 : height - 10;
- document.getElementById('view').style.height = height + 'px';
+ document.getElementById('rolesview').style.height = height + 'px';
}
Index: trunk/webapps/einotebook/scripts/Event.js
===================================================================
--- trunk/webapps/einotebook/scripts/Event.js (revision 540)
+++ trunk/webapps/einotebook/scripts/Event.js (revision 551)
@@ -178,5 +178,5 @@
function focus()
{
- /* This method was discarded because it moved the scroll bar of the parent of
+ /* This next 3 lines were discarded because it moved the scroll bar of the parent of
* the given window in addition to the scroll bar of the given window..
var positionOfPound = window.location.indexOf("#");
@@ -184,5 +184,5 @@
window.location = rootLocation + "#" + eventAnchorName;
*/
- events.win.scrollTo(0, absoluteTop(events.doc.getElementById(this.eventHeaderID)));
+ events.win.scrollTo(0, absoluteTop(events.doc.getElementById(this.eventHeaderID)));
}
@@ -195,5 +195,5 @@
if (events.doc.getElementById(this.eventHeaderID) != null)
{
- events.doc.getElementById(this.eventHeaderID).style.borderColor = "blue";
+ events.doc.getElementById(this.eventHeaderID).style.borderColor = "blue";
events.doc.getElementById(this.eventHeaderID).style.backgroundColor = "yellow";
events.doc.getElementById(this.eventHeaderID).style.color = "black";
Index: trunk/webapps/einotebook/scripts/Evaluation.js
===================================================================
--- trunk/webapps/einotebook/scripts/Evaluation.js (revision 548)
+++ trunk/webapps/einotebook/scripts/Evaluation.js (revision 551)
@@ -10,4 +10,5 @@
//========== public constants ==========//
+ this.ratingQualities = ["", "Worst","Poor","Average","Good","Best"];
this.id = Evaluation.id;
this.ratingGroupName = "evaluationGroup" + this.id;
@@ -75,6 +76,5 @@
this.rating = givenRating;
-
- console.log(this.ratingGroupName + " recordRating of " + this.rating )
+ //console.log(this.ratingGroupName + " recordRating of " + this.rating )
}
@@ -103,9 +103,9 @@
"
" +
"
" +
- "
Best
" +
- "
Good
" +
- "
Average
" +
- "
Poor
" +
- "
Worst
" +
+ "
"+this.ratingQualities[5]+"
" +
+ "
"+this.ratingQualities[4]+"
" +
+ "
"+this.ratingQualities[3]+"
" +
+ "
"+this.ratingQualities[2]+"
" +
+ "
"+this.ratingQualities[1]+"
" +
"
" +
"
" +
Index: trunk/webapps/einotebook/script/scrollframe.js
===================================================================
--- trunk/webapps/einotebook/script/scrollframe.js (revision 548)
+++ trunk/webapps/einotebook/script/scrollframe.js (revision 551)
@@ -12,6 +12,9 @@
}
+// Collect all the ratings from the events
function collectRatings()
{
+ var output = ""
+ var ratingCount = 0
// Consider each event in the incident script
for (var evtidx = 0; evtidx < events.length; evtidx++)
@@ -27,10 +30,14 @@
// If it not the default value we want to save it
if (item.rating > 0)
- {
- console.log("collecting event"+evtidx + " at " + events[evtidx].time.format() +" "+item.type + " " + item.rating)
+ { // Build a string for the log in this format:
+ //03:01:00, Evaluation, CMS, Poor
+ output += events[evtidx].time.format() +", Evaluation, "+item.type + ", " + item.ratingQualities[item.rating] + "\n"
+ ratingCount += 1;
}
}
}
}
+ submitRatings(output);
+ alert(ratingCount + " rating were saved.")
}
@@ -55,12 +62,12 @@
*/
-// TODO
-function submitRatings()
+// Send the string of ratings to the server
+function submitRatings(logString)
{
// Using POST to send the data
var xhr = new XMLHttpRequest();
- xhr.open("POST", "../../cgi-bin/saveRatings.py", true);
+ xhr.open("POST", "/cgi-bin/saveRatingsToLog.py", true);
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
// send the collected data
- xhr.send("msg="+outString);
+ xhr.send("msg="+logString);
}
Index: trunk/webapps/einotebook/script/index.html
===================================================================
--- trunk/webapps/einotebook/script/index.html (revision 548)
+++ trunk/webapps/einotebook/script/index.html (revision 551)
@@ -20,5 +20,5 @@
width='100%'>
-
+