|
|
@@ -273,18 +273,20 @@ function addTask(userid, start_date, end_date) {
|
|
|
if(teamclassarry!=null){
|
|
|
var d = hasinList(usercounttemp,teamclassarry)
|
|
|
hasin = d!=null
|
|
|
- if(hasin){
|
|
|
- if(d.check_status == 22){
|
|
|
- taskfail = true;
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ if(usercounttemp.check_status == 22){
|
|
|
+ taskfail = true;
|
|
|
+ }
|
|
|
}
|
|
|
+ if(usercounttemp.check_status == 22){
|
|
|
+ taskfail = true;
|
|
|
+ }
|
|
|
var classname = "btn-warning disabled";
|
|
|
if(hasin){
|
|
|
continue;
|
|
|
}
|
|
|
if(taskfail){
|
|
|
- classname = "btn-important disabled";
|
|
|
+ classname = "gimportant disabled";
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -348,6 +350,11 @@ function addTask(userid, start_date, end_date) {
|
|
|
' width:10px;' +
|
|
|
' height: 10px;' +
|
|
|
'}' +
|
|
|
+ '.gimportant{' +
|
|
|
+ ' background:#BD7B46 !important;' +
|
|
|
+ ' color:#ffffff !important'+
|
|
|
+ '}' +
|
|
|
+
|
|
|
'</style>';
|
|
|
|
|
|
var table1 = '<div class="row scrollbar" style="height:' + height + 'px;width:' + (allwidth - 21) + 'px;overflow:scroll;padding-top:10px;padding-bottom:10px"><table class="table" style="height:' + height + 'px;margin:0px">' +
|
