altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Have group conflicts showing now - not sure find-free is working yet

Browse source 
- Legacy-Id: 7551
This commit is contained in:
Robert Sparks 2014-03-27 19:47:31 +00:00
parent e953538543
commit 53feb01d67
3 changed files with 113 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
static/css/agenda.css
View file

@ -502,6 +502,11 @@ div#conflict_table {
background-color: #89D;
}
div.conflictlevel {
display: inline-block;
min-width: 1.5em;
}
div.our-conflict {
padding-left: 20px;
background-image: url('/images/conflict-boxes/narow3.png');

31
static/js/agenda/agenda_listeners.js
View file

@ -881,15 +881,42 @@ function group_name_or_empty(constraint) {
function draw_constraints(session) {
if("conflicts" in session) {
var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' };
var group_icons = "";
var group_set = {};
$.each(session.conflicts, function(index) {
conflict = session.conflicts[index];
conflict.build_othername();
if(conflict.conflict_groupP()) {
group_icons += "<li class='conflict'>"+conflict.conflict_view();
if ( ! (conflict.othergroup_name in group_set) ) {
group_set[conflict.othergroup_name] = {};
}
group_set[conflict.othergroup_name][conflict.direction]=display[conflict.conflict_type];
// This had been in build_group_conflict_view
conflict.populate_conflict_classes();
highlight_conflict(conflict);
}
});
$.each(group_set, function(index) {
group = group_set[index];
group_view = "<li class='conflict'>";
group_view += "<div class='conflictlevel'>"
if ('ours' in group_set[index]) {
group_view += group_set[index].ours+"->"
}
group_view += "</div>"
group_view += index;
group_view += "<div class='conflictlevel'>"
if ('theirs' in group_set[index]) {
group_view += "->"+group_set[index].theirs
}
group_view += "</div>"
group_view += "</li>";
group_icons += group_view;
});
if(group_icons == "") {
$("#conflict_group_list").html("none");
} else {

125
static/js/agenda/agenda_objects.js
View file

@ -680,6 +680,7 @@ function Session() {
this.area = "noarea";
this.special_request = "";
this.conflicted = false;
this.conflicted_direction = {};
this.theirconflicted = false;
this.double_wide = false;
this.attendees = undefined;
@ -886,36 +887,31 @@ Session.prototype.mark_conflict = function(value) {
this.conflicted = value;
};
Session.prototype.add_conflict = function(conflict) {
if (conflict.direction==='ours') {
this.conflicted = true;
if(this.highest_conflict==undefined) {
this.highest_conflict = conflict;
} else {
var oldhighest = this.highest_conflict;
this.highest_conflict = this.highest_conflict.conflict_compare(conflict);
if(_conflict_debug) {
console.log("add conflict for", this.title,
oldhighest.conflict_type, ">?", conflict.conflict_type,
"=", this.highest_conflict.conflict_type);
}
}
this.conflict_level = this.highest_conflict.conflict_type;
} else {
this.theirconflicted = true;
if(this.highest_theirconflict==undefined) {
this.highest_theirconflict = conflict;
} else {
var oldhighest = this.highest_theirconflict;
this.highest_theirconflict = this.highest_theirconflict.conflict_compare(conflict);
if(_conflict_debug) {
console.log("add conflict for", this.title,
oldhighest.conflict_type, ">?", conflict.conflict_type,
"=", this.highest_theirconflict.conflict_type);
}
}
this.theirconflict_level = this.highest_theirconflict.conflict_type;
this.conflicted = true;
if (this.conflicted_direction==undefined) {
this.conflicted_direction={};
}
this.conflicted_direction[conflict.direction] = true;
if (this.highest_conflict==undefined) {
this.highest_conflict={};
}
if(this.highest_conflict[conflict.direction]==undefined) {
this.highest_conflict[conflict.direction] = conflict;
} else {
var oldhighest = this.highest_conflict[conflict.direction];
this.highest_conflict[conflict.direction] = this.highest_conflict[conflict.direction].conflict_compare(conflict);
if(_conflict_debug) {
console.log("add conflict for", this.title,
oldhighest.conflict_type, ">?", conflict.conflict_type,
"=", this.highest_conflict[conflict.direction].conflict_type);
}
}
if (this.conflict_level==undefined){
this.conflict_level={};
}
this.conflict_level[conflict.direction] = this.highest_conflict[conflict.direction].conflict_type;
};
Session.prototype.clear_conflict = function() {
this.conflicted = false;
};
@ -936,26 +932,27 @@ Session.prototype.clear_all_conflicts = function(old_column_classes) {
Session.prototype.show_conflict = function() {
if(_conflict_debug) {
console.log("showing conflict for", this.title, this.conflict_level);
console.log("showing conflict for", this.title, this.conflict_level['ours'],this.conflict_level['theirs']);
}
// this.element().find('.ourconflicts').addClass("actual_" + this.conflict_level);
// this.element().find('.theirconflicts').addClass("actual_" + this.conflict_level);
var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' };
if (this.conflicted) {
this.element().find('.ourconflicts').text('->'+display[this.conflict_level]);
}
if (this.theirconflicted) {
this.element().find('.theirconflicts').text(display[this.theirconflict_level]+'->');
if ('ours' in this.conflict_level) {
this.element().find('.ourconflicts').text('->'+display[this.conflict_level.ours]);
}
if ('theirs' in this.conflict_level) {
this.element().find('.theirconflicts').text(display[this.conflict_level.theirs]+'->');
}
}
};
Session.prototype.hide_conflict = function() {
if(_conflict_debug) {
console.log("removing conflict for", this.title);
}
// this.element().removeClass("actual_conflict");
this.element().find('.ourconflicts').text('');
this.element().find('.theirconflicts').text('');
};
Session.prototype.display_conflict = function() {
if(this.conflicted || this.theirconflicted) {
this.show_conflict();
@ -963,10 +960,12 @@ Session.prototype.display_conflict = function() {
this.hide_conflict();
}
};
Session.prototype.reset_conflicts = function() {
this.conflict_level = undefined;
this.highest_conflict = undefined;
this.conflicted = false;
this.conflicted_direction = undefined;
this.theirconflict_level = undefined;
this.highest_theirconflict = undefined;
this.theirconflicted = false;
@ -974,7 +973,7 @@ Session.prototype.reset_conflicts = function() {
Session.prototype.show_personconflict = function() {
if(_conflict_debug) {
console.log("showing person conflict for", this.title, this.conflict_level);
console.log("showing person conflict for", this.title, this.conflict_level.ours);
}
this.personconflict_element().removeClass("hidepersonconflict");
this.personconflict_element().addClass("showpersonconflict");
@ -1294,6 +1293,21 @@ Session.prototype.fill_in_constraints = function(constraint_list) {
session_obj.conflicts.push(session_obj.constraints["conflic3"][index]);
});
}
if("conflict" in this.theirconstraints) {
$.each(this.theirconstraints["conflict"], function(index) {
session_obj.conflicts.push(session_obj.theirconstraints["conflict"][index]);
});
}
if("conflic2" in this.theirconstraints) {
$.each(this.theirconstraints["conflic2"], function(index) {
session_obj.conflicts.push(session_obj.theirconstraints["conflic2"][index]);
});
}
if("conflic3" in this.theirconstraints) {
$.each(this.theirconstraints["conflic3"], function(index) {
session_obj.conflicts.push(session_obj.theirconstraints["conflic3"][index]);
});
}
this.calculate_bethere();
this.conflicts = sort_conflict_list(this.conflicts)
};
@ -1573,17 +1587,35 @@ Constraint.prototype.show_conflict_view = function() {
//console.log("viewed", this.thisgroup.href);
};
Constraint.prototype.build_group_conflict_view = function() {
Constraint.prototype.populate_conflict_classes = function() {
// this is used for the red square highlighting.
var checkbox_id = "conflict_"+this.dom_id;
conflict_classes[checkbox_id] = this;
return "<div class='conflict our-"+this.conflict_type+"' id='"+this.dom_id+
"'>"+this.othergroup_name+"</div>";
};
// Made dead by change to how the group view is built out
//Constraint.prototype.build_group_conflict_view = function() {
//
// var display = { 'conflict':'1' , 'conflic2':'2' , 'conflic3':'3' };
//
// // this is used for the red square highlighting.
// var checkbox_id = "conflict_"+this.dom_id;
// conflict_classes[checkbox_id] = this;
//
// build = "<div id='"+this.dom_id+"'>";
// if (this.direction=='theirs') {
// build += display[this.conflict_type]+"->";
// }
// build += this.othergroup_name;
// if (this.direction=='ours') {
// build += "->"+display[this.conflict_type];
// }
// build += "</div>";
//
// return build
//
//};
Constraint.prototype.build_people_conflict_view = function() {
var area_mark = "";
if(this.person != undefined && this.person.area_mark_basic != undefined) {
@ -1612,9 +1644,10 @@ Constraint.prototype.conflict_view = function() {
return this.build_people_conflict_view();
}
else {
//console.log("conflict_view for", this.href);
this.build_othername();
return this.build_group_conflict_view();
// This function is currently never called for this case
console.log("!! unexpected conflict_view for", this.href);
//this.build_othername();
//return this.build_group_conflict_view();
}
};