fix: robust cleanTitle/cleanResp for all sub-item patterns (Latin+Cyrillic)

This commit is contained in:
Dauren777 2026-06-12 10:11:49 +00:00
parent 7b0b0c65d5
commit 70818614ad

View File

@ -980,9 +980,11 @@ var stc={warn:"a",late:"r",done:"g"};
var USR={curator:{n:"Куратор ПБ",bg:0},admin:{n:"Администратор",bg:0},dpp:{n:"Директор ДПБ",bg:0},ivanov:{n:"Иванов Иван",bg:1},petrov:{n:"Петров Петр",bg:2},sidorov:{n:"Сидоров Сидор",bg:3},kozhin:{n:"Кожин А.М.",bg:4},ismailov:{n:"Исмаилов Р.К.",bg:1},nurpeisov:{n:"Нурпеисов Д.А.",bg:5},suleimenov:{n:"Сулейменов К.Т.",bg:6},kassenov:{n:"Касенов Б.Б.",bg:7},serikov:{n:"Сериков Е.С.",bg:8},zhunusov:{n:"Жунусов А.А.",bg:2},muratov:{n:"Муратов А.Т.",bg:3},bakirov:{n:"Бакиров Т.Н.",bg:4}};
function cleanTitle(e){
if(!e||!e.t)return"";
if(!e.sub||!e.sub.length)return e.t;
var t=e.t;var idx=t.indexOf("\na)");if(idx<0)idx=t.indexOf("\n\u0430)");if(idx<0)idx=t.indexOf("\na\u0029");if(idx<0)idx=t.indexOf(":"+String.fromCharCode(10)+"a");
if(!e||!e.t)return"";if(!e.sub||!e.sub.length)return e.t;
var t=e.t;var idx=-1;
var pats=[String.fromCharCode(10)+"a)",String.fromCharCode(10)+"b)",String.fromCharCode(10)+"\u0430)",String.fromCharCode(10)+"\u0431)",": "+String.fromCharCode(10)+"a",":"+String.fromCharCode(10)+"a"];
for(var i=0;i<pats.length;i++){var p=t.indexOf(pats[i]);if(p>0&&(idx<0||p<idx))idx=p}
if(idx<0){var m=t.match(new RegExp(String.fromCharCode(10)+"[a-z\u0430-\u044F]\\)"));if(m)idx=t.indexOf(m[0])}
return idx>0?t.substring(0,idx).trim():t
}
function cleanResp(e){
@ -1181,7 +1183,7 @@ function renderEv(){
var sr=subResp(e.r,e.sub[si].l)||nl2c(e.r);
var ss=e.s==="wait"?"warn":e.s;
var scl=stc[ss]||"a";
h+="<tr class='"+rowCl+" sub-item-row'><td style='padding-left:24px;font-size:11px;color:#64748B'>"+e.id+"."+esc(e.sub[si].l)+"</td>";
var subR=subResp(e.r,e.sub[si].l);if(!subR||subR.length<2)subR=nl2c(e.r);h+="<tr class='"+rowCl+" sub-item-row'><td style='padding-left:24px;font-size:11px;font-weight:600;color:#005BAA'>"+e.id+"."+esc(e.sub[si].l)+"</td>";
h+="<td style='font-size:11px'>"+esc(e.sub[si].t)+"</td>";
h+="<td style='font-size:11px'>"+esc(sr)+"</td>";
h+="<td style='font-size:11px'>"+e.due+"</td>";
@ -1821,6 +1823,6 @@ function dlAnalyticsWord(){
var a=document.createElement("a");a.href=URL.createObjectURL(blob);a.download="analytics.doc";a.click()
}
</script></script></script></script></script></script></script></script></script></script>
</script></script></script></script></script></script></script></script></script></script></script>
</body>
</html>