From 3d93536189167de933461719f78df96fe108a996 Mon Sep 17 00:00:00 2001 From: irigm Date: Thu, 27 Feb 2020 09:40:17 +0600 Subject: [PATCH] =?UTF-8?q?=D0=A1=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B5?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metadata/dbms/dbms.css | 5 +---- metadata/dbms/editrecord.js | 37 +++++++++++++++----------------- metadata/dbms/records.php | 21 +++++++++--------- metadata/dbms/showrecord.js | 28 ++++++++++++------------ metadata/dbms/tools.js | 26 +++++++++++----------- metadata/include/class_table.php | 4 ++-- metadata/include/tools.php | 4 ++-- metadata/include/xmltools.php | 4 ++-- 8 files changed, 60 insertions(+), 69 deletions(-) diff --git a/metadata/dbms/dbms.css b/metadata/dbms/dbms.css index 8ca6c3a..decd1f4 100644 --- a/metadata/dbms/dbms.css +++ b/metadata/dbms/dbms.css @@ -18,16 +18,13 @@ input,textarea { margin: 0px 0px; } - select { display: block; -moz-box-sizing: content-box; -webkit-box-sizing:content-box; - /*box-sizing:content-box;*/ - box-sizing: border-box; + box-sizing:content-box; } - /*Над всеми по Z*/ #menu { diff --git a/metadata/dbms/editrecord.js b/metadata/dbms/editrecord.js index a092741..01b6003 100644 --- a/metadata/dbms/editrecord.js +++ b/metadata/dbms/editrecord.js @@ -23,7 +23,7 @@ class EdtRec this.win=new TWin(); this.win.TWin(pageX-10,pageY-10); this.win.setSize("500px","150px"); - this.win.setContent('
'); + this.win.setContent('
'); let eDiv=document.getElementById('eDiv'+this.uid); eDiv.innerHTML = '
' @@ -140,7 +140,7 @@ class EdtRec //Записываю record_id в соответствующее XML поле this.setPropCdata(nodeType.getAttribute("ObjectID"),record_id); - var str=''; + let str=''; str+=' '; str+=' '; str+=' '; @@ -346,7 +346,7 @@ class EdtRec var button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","..."); - button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;"; + button.style.cssText="width:30px; font-size: 9pt;"; button.onclick=function(thiz,nodeProp){ return function(){ thiz.callWindow(nodeProp); };}(this,nodeProp); @@ -399,7 +399,6 @@ class EdtRec }else if(vt=="i4") { - //alert("prop name = "+nodeProp.getAttribute("n")); //If there is a node "list" with the elements "CheckBox" then create them. @@ -423,7 +422,6 @@ class EdtRec opt=opt.nextSibling; } td2.appendChild( select ); - }else { var table=document.createElement('table'); @@ -434,9 +432,9 @@ class EdtRec var newCell1 = newRow.insertCell(0); //in the created line we add a column newCell1.style.cssText="padding:0px; padding-right:1px; width: 100%;"; var newCell2 = newRow.insertCell(1); //in the created line we add a column - newCell2.style.cssText="padding:0px; padding-right:1px;height:100%;"; + newCell2.style.cssText="padding:0px; padding-right:1px;"; var newCell3 = newRow.insertCell(2); //in the created line we add a column - newCell3.style.cssText="padding:0px;height:100%;"; + newCell3.style.cssText="padding:0px;"; input = document.createElement('input'); input.style.cssText="width: 100%; height:22px;"; @@ -450,7 +448,7 @@ class EdtRec button.setAttribute("type","button"); button.setAttribute("value","+"); button.setAttribute("title",_("Increase_by_1")); - button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;"; + button.style.cssText="height:22px;width:22px;"; button.onclick=function(inp){return function(){inp.value=getIntVal(inp.value)+1;}}(input); newCell2.appendChild( button ); @@ -459,7 +457,7 @@ class EdtRec button.setAttribute("type","button"); button.setAttribute("value","-"); button.setAttribute("title",_("Decrease_by_1")); - button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;"; + button.style.cssText="height:22px;width:22px;"; button.onclick=function(inp){return function(){inp.value=getIntVal(inp.value)-1;}}(input); newCell3.appendChild( button ); @@ -488,9 +486,9 @@ class EdtRec table.border=0; let newRow=table.insertRow(0); //add a row to the created table var newCell1 = newRow.insertCell(0); //in the created line we add a column - newCell1.style.cssText="padding:0px;padding-right:1px;width:100%;"; + newCell1.style.cssText="padding:0px; width: 100%;"; var newCell2 = newRow.insertCell(1); //in the created line we add a column - newCell2.style.cssText="padding:0px;height:100%;"; + newCell2.style.cssText="padding:0px;"; select = document.createElement('select'); select.style.cssText="width: 100%; height:22px; line-height: 22px;"; @@ -510,7 +508,7 @@ class EdtRec var button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","..."); - button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;height:100%;"; + button.style.cssText="width:30px; font-size: 9pt;"; button.onclick=this.onSelObj(nodeProp.getAttribute("ot"),nodeProp.getAttribute("n")); newCell2.appendChild(button); @@ -577,7 +575,7 @@ class EdtRec var button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","..."); - button.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;"; + button.style.cssText="width:30px; font-size: 9pt;"; button.onclick=this.onSelObj(nodeProp.getAttribute("ot"),nodeProp.getAttribute("n")); newCell2.appendChild(button); @@ -648,14 +646,14 @@ class EdtRec btnSel.setAttribute("value","..."); btnSel.setAttribute("title",_('Upload')); - btnSel.style.cssText="width:30px;font-size:9pt;margin:0px;padding:0px;"; + btnSel.style.cssText="width:30px; font-size: 9pt;"; newCell2.appendChild(btnSel); var button2 = document.createElement('input'); button2.setAttribute("type","button"); button2.setAttribute("value","X"); button2.setAttribute("title",_('Delete')); - button2.style.cssText="height:22px;width:22px;margin:0px;padding:0px;"; + button2.style.cssText="height:22px;width:22px;"; button2.onclick=function(inp,ifr){return function(){ inp.value=''; getIframeDocument(ifr).forms["form"].reset(); }}(input,ifr); newCell3.appendChild(button2); @@ -690,7 +688,7 @@ class EdtRec table.style.cssText="width:100%;border-spacing:0;border-collapse:collapse;"; //table.setAttribute("bgColor","#0000FF"); table.border=0; - let newRow=table.insertRow(0); + newRow=table.insertRow(0); var newCell1 = newRow.insertCell(0); newCell1.style.cssText="padding:0px;width: 100%;"; var newCell2 = newRow.insertCell(1); @@ -705,7 +703,7 @@ class EdtRec newCell1.appendChild( input ); var img = document.createElement('img'); - img.src='../resources/metadata/dbms/images/datepicker.jpg'; + img.src='../resources/engine/images/datepicker.jpg'; img.style.cssText="cursor: pointer;"; newCell2.appendChild(img); @@ -762,7 +760,7 @@ class EdtRec td.setAttribute("align","right"); button = document.createElement('input'); button.setAttribute("type","button"); - button.style.cssText="margin:0px;margin-right:1px;padding:0px;"; + button.style.cssText="width: 90px;"; button.setAttribute("value",_('Apply')); button.onclick=function(thiz){ return function(){ @@ -770,10 +768,9 @@ class EdtRec }; }(this); td.appendChild( button ); - button = document.createElement('input'); //Button cancel button.setAttribute("type","button"); - button.style.cssText="margin:0px;padding:0px;"; + button.style.cssText="width: 90px;"; button.setAttribute("value",_('Cancel')); //button.onclick=function f_exit(this) { alert(this.win.div); } button.onclick=function(thiz){ return function(){thiz.win.Close();};}(this); diff --git a/metadata/dbms/records.php b/metadata/dbms/records.php index dd68e91..3a3541e 100644 --- a/metadata/dbms/records.php +++ b/metadata/dbms/records.php @@ -403,26 +403,25 @@ if($vt=='blob') { $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',':'.$nodePropData->getAttribute("n"),$sql_query); //Название файла запишем в указаное поле - $v=getCdataValue($nodePropData); + $val=getCdataValue($nodePropData); $cd=findFirstNodeOnAttribute($currNode,"prop","n",$nodePropData->getAttribute("n"))->getAttribute("cd"); $nd=findFirstNodeOnAttribute($nodeProp,'prop','n',$cd); - if($nd!=null) { getCdata($nd)->nodeValue=$v; } + if($nd!=null) { getCdata($nd)->nodeValue=$val; } }else if($vt=='file') { $val=getCdataValue($nodePropData); $valSql=getSQLValue($vt, $val); $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',$valSql,$sql_query); - //Копируем файл из './temp/' в указанную папку относительно корня сайта $flnm = afterLast($val,'_'); $dir = "./temp/"; - if($v!='' && file_exists($dir.$flnm)) + if($val!='' && file_exists($dir.$flnm)) { $path= $_SERVER['DOCUMENT_ROOT'].'/'.findFirstNodeOnAttribute($currNode,"prop","n",$nodePropData->getAttribute("n"))->getAttribute("path"); @mkdir($path);//Создаём папку если её нет - if(!rename($dir.$flnm, $path.$flnm)) sendError('Can\'t rename to "'.$path.$v.'"!'); + if(!rename($dir.$flnm, $path.$flnm)) + sendError('Can\'t rename to "'.$path.$v.'"!'); } - }else { $v=getSQLValue($vt, getCdataValue($nodePropData)); $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',$v,$sql_query); @@ -525,10 +524,10 @@ if($vt=='blob') { $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',':'.$nodePropData->getAttribute("n"),$sql_query); //Название файла запишем в указаное поле - $v=getCdataValue($nodePropData); + $val=getCdataValue($nodePropData); $cd=findFirstNodeOnAttribute($currNode,"prop","n",$nodePropData->getAttribute("n"))->getAttribute("cd"); //Имя поля с которого нужно брать название файла $nd=findFirstNodeOnAttribute($nodeProps,'prop','n',$cd); - if($nd!=null) getCdata($nd)->nodeValue=$v; + if($nd!=null) getCdata($nd)->nodeValue=$val; }else if($vt=='file') //Файл который не загружается в базу а храниться в файловой системе { $val=getCdataValue($nodePropData); @@ -537,7 +536,7 @@ //Копируем файл в указанную папку относительно корня сайта $flnm = afterLast($val,'_'); $dir = "./temp/"; - if($v!='' && file_exists($dir.$flnm)) + if($val!='' && file_exists($dir.$flnm)) { $path= $_SERVER['DOCUMENT_ROOT'].'/'.findFirstNodeOnAttribute($currNode,"prop","n",$nodePropData->getAttribute("n"))->getAttribute("path"); @mkdir($path);//Создаём папку если её нет @@ -546,8 +545,8 @@ } }else { - $v=getSQLValue($vt, getCdataValue($nodePropData)); - $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',$v,$sql_query); + $val=getSQLValue($vt, getCdataValue($nodePropData)); + $sql_query=str_replace('${'.$nodePropData->getAttribute("n").'}',$val,$sql_query); } } $nodePropData=$nodePropData->nextSibling; diff --git a/metadata/dbms/showrecord.js b/metadata/dbms/showrecord.js index aca3887..8e9474d 100644 --- a/metadata/dbms/showrecord.js +++ b/metadata/dbms/showrecord.js @@ -538,7 +538,7 @@ function SRec() { var table=document.createElement('table'); table.border=0; - table.style.cssText="width:100%;/*table-layout:fixed;*/border-spacing:0;border-collapse:collapse;"; + table.style.cssText="width:100%;table-layout:fixed;border-spacing:0;border-collapse:collapse;"; newRow=table.insertRow(0); var newCell1 = newRow.insertCell(0); newCell1.style.cssText="padding:0px;width:100%;"; @@ -562,7 +562,7 @@ function SRec() var img = document.createElement('img'); - img.src='../resources/metadata/dbms/images/datepicker.jpg'; + img.src='../resources/engine/images/datepicker.jpg'; img.style.cssText="cursor: pointer;"; newCell2.appendChild(img); @@ -584,7 +584,7 @@ function SRec() { var table=document.createElement('table'); table.border=0; - table.style.cssText="width:100%;/*table-layout:fixed;*/border-spacing:0;border-collapse:collapse;"; + table.style.cssText="width:100%;table-layout:fixed;border-spacing:0;border-collapse:collapse;"; newRow=table.insertRow(0); var newCell1 = newRow.insertCell(0); newCell1.style.cssText="padding:0px;width:100%;"; @@ -608,7 +608,7 @@ function SRec() var img = document.createElement('img'); - img.src='../resources/metadata/dbms/images/datepicker.jpg'; + img.src='../resources/engine/images/datepicker.jpg'; img.style.cssText="cursor: pointer;"; newCell2.appendChild(img); @@ -685,14 +685,14 @@ function SRec() { var table=document.createElement('table'); table.border=0; - table.style.cssText="width:100%;/*table-layout:fixed;*/border-spacing:0;border-collapse:collapse;"; + table.style.cssText="width:100%;table-layout:fixed;border-spacing:0;border-collapse:collapse;"; newRow=table.insertRow(0); //We add a row in the created table. var newCell1 = newRow.insertCell(0); - newCell1.style.cssText="padding:0px;padding-right:1px;width:100%;"; + newCell1.style.cssText="padding:0px;width:100%;"; var newCell2 = newRow.insertCell(1); - newCell2.style.cssText="padding:0px;padding-right:1px;height:100%;"; + newCell2.style.cssText="padding:0px;width:25px;"; var newCell3 = newRow.insertCell(2); - newCell3.style.cssText="padding:0px;width:25px;height:100%;"; + newCell3.style.cssText="padding:0px;width:25px;"; input = document.createElement('input'); input.style.cssText="width: 100%;"; @@ -708,14 +708,14 @@ function SRec() button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","+"); - button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;"; + button.style.cssText="height:22px;width:22px;"; newCell2.appendChild( button ); button.onclick=function(inp){return function(){ inp.value=getIntVal(inp.value)+1; }}(input); button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","-"); - button.style.cssText="height:100%;width:22px;margin:0px;padding:0px;"; + button.style.cssText="height:22px;width:22px;"; button.onclick=function(inp){return function(){ inp.value=getIntVal(inp.value)-1; }}(input); newCell3.appendChild( button ); @@ -743,7 +743,7 @@ function SRec() var table=document.createElement('table'); //table.setAttribute("bgColor","#0000FF") table.border=0; - table.style.cssText="width:100%;/*table-layout:fixed;*/border-spacing:0;border-collapse:collapse;"; + table.style.cssText="width:100%; table-layout:fixed;border-spacing:0;border-collapse:collapse;"; newRow=table.insertRow(0); //We add a row in the created table. var newCell1 = newRow.insertCell(0); newCell1.style.cssText="padding:0px; border: 0px solid #999999; width:100%;"; @@ -765,7 +765,7 @@ function SRec() button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","..."); - button.style.cssText="display:block; box-sizing: border-box; margin: 0px; padding: 0px; width:100%; height:100%; font-size: 9pt;"; + button.style.cssText="display:block; box-sizing: border-box; width:100%; height:100%; font-size: 9pt;"; button.onclick=function(thiz,val1,val2){return function(){thiz.SelectObjects(val1,val2);};}(this,object,columnNode.getAttribute("n")); newCell2.appendChild(button); @@ -832,7 +832,7 @@ function SRec() button = document.createElement('input'); button.setAttribute("type","button"); button.setAttribute("value","..."); - button.style.cssText="width:30px; height:100%;margin: 0px; padding: 0px;"; + button.style.cssText="width:30px; height:22px;"; button.onclick=function(thiz,val1,val2) { return function(){thiz.SelectObjects(val1,val2);}; }(this,object,columnNode.getAttribute("n")); @@ -1476,7 +1476,7 @@ function SRec() //We run through the marked records and request their removal this.deleteRecord=function(recordid) { - if (confirm(_("Are_you_sure_you_want_to_delete_the_entries")+'?')) + if (confirm(_("Are_you_sure_you_want_to_delete_the_entries"))) { for(var i=0;i
'; + pBarDiv.innerHTML='
'; obj.appendChild(pBarDiv); }; @@ -913,7 +911,7 @@ function TRequest(listener) }; if(listener.applyReq==null) alert('An object can not be found the function: "applyReq()"!'); - if(listener.name==null) alert('An object can not be found the propenty: "name"!'); + //if(listener.name==null) alert('An object can not be found the propenty: "name"!'); this.winObj=listener; //private this.m_seq=0; @@ -1114,19 +1112,19 @@ function TWin(dialog) str+=''; str+=' '; str+=' '; - str+=' '; - str+=' '; - str+=' '; + str+=' '; + str+=' '; + str+=' '; str+=' '; str+=' '; - str+=' '; + str+=' '; str+=' '; - str+=' '; + str+=' '; str+=' '; str+=' '; - str+=' '; - str+=' '; - str+=' '; + str+=' '; + str+=' '; + str+=' '; str+=' '; str+='
'; diff --git a/metadata/include/class_table.php b/metadata/include/class_table.php index 1d66be0..98c2e92 100644 --- a/metadata/include/class_table.php +++ b/metadata/include/class_table.php @@ -247,8 +247,8 @@ class TCTable /** * Конструктор - * @param Строка $name Название таблицы - * @param Целое $id Идентификатор таблицы + * @param string $name Название таблицы + * @param integer $id Идентификатор таблицы */ function TCTable($name,$id) { $this->name=$name; diff --git a/metadata/include/tools.php b/metadata/include/tools.php index ce1b314..0670534 100644 --- a/metadata/include/tools.php +++ b/metadata/include/tools.php @@ -190,7 +190,7 @@ function selfURL() { if(!isset($_SERVER['REQUEST_URI'])){ $suri = $_SERVER['PHP_SELF']; } else { $suri = $_SERVER['REQUEST_URI']; } - $s = empty($_SERVER["HTTPS"]) ? '' : (($_SERVER["HTTPS"] == "on") ? "s" : ""); + $s = empty($_SERVER["HTTPS"]) ? '' : ($_SERVER["HTTPS"] == "on") ? "s" : ""; $sp=strtolower($_SERVER["SERVER_PROTOCOL"]); $pr = substr($sp,0,strpos($sp,"/")).$s; $pt = ($_SERVER["SERVER_PORT"] == "80") ? "" : (":".$_SERVER["SERVER_PORT"]); @@ -202,7 +202,7 @@ function selfDomain() { //if(!isset($_SERVER['REQUEST_URI'])) $suri = $_SERVER['PHP_SELF']; //else $suri = $_SERVER['REQUEST_URI']; - $s = empty($_SERVER["HTTPS"]) ? '' : (($_SERVER["HTTPS"] == "on") ? "s" : ""); + $s = empty($_SERVER["HTTPS"]) ? '' : ($_SERVER["HTTPS"] == "on") ? "s" : ""; $sp=strtolower($_SERVER["SERVER_PROTOCOL"]); $pr = substr($sp,0,strpos($sp,"/")).$s; $pt = ($_SERVER["SERVER_PORT"] == "80") ? "" : (":".$_SERVER["SERVER_PORT"]); diff --git a/metadata/include/xmltools.php b/metadata/include/xmltools.php index 4bbd1e6..1df0cf1 100644 --- a/metadata/include/xmltools.php +++ b/metadata/include/xmltools.php @@ -2,7 +2,7 @@ /** * Вернуть строку по DOMNode * @param DOMNode $node Узел XML - * @return Строка + * @return string */ function getXML($node) { @@ -12,7 +12,7 @@ /** * Найти первый попавшийся узел с заданным именем nodeName. * @param DOMNode $node Узел. - * @param Строка $nodename Название узла. + * @param string $nodename Название узла. * @return DOMNode Найденный узел либо null. */ function findNode($node, $nodename)