igor/Metadata_PHP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i++ передвидул выше а то на выборка при нажатии на колонку происходила не правильно

Browse Source
This commit is contained in:
Igor I
2024-08-14 16:50:44 +05:00
parent ec85845d9e
commit 91e8b21d39
10 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
metadata/dbms/DBMSRecords.java
View File

@ -1716,7 +1716,7 @@ public class DBMSRecords implements ServletContextAware {
Object exprResult = expr.evaluate(nTypeS, XPathConstants.NODESET); Object exprResult = expr.evaluate(nTypeS, XPathConstants.NODESET);
nodeList = (NodeList) exprResult; nodeList = (NodeList) exprResult;
for (int i = 0; i < nodeList.getLength(); i++) { for (int i = 0; i < nodeList.getLength(); i++) {
writer.write("<td bgcolor=\"#d1d1d1\" width=\"" + nodeList.item(i).getAttributes().getNamedItem("width").getNodeValue() + "px\"><b>" + trts(conn,nodeList.item(i).getAttributes().getNamedItem("d").getNodeValue(),user) writer.write("<td style=\"background-color:#d1d1d1;\" width=\"" + nodeList.item(i).getAttributes().getNamedItem("width").getNodeValue() + "px\"><b>" + trts(conn,nodeList.item(i).getAttributes().getNamedItem("d").getNodeValue(),user)
+ "</b></td>"); + "</b></td>");
} }
writer.write(" </tr>\n"); writer.write(" </tr>\n");

4
metadata/dbms/dbms.xyz
View File

@ -1247,12 +1247,12 @@
fwrite($fh, ' <caption><b>'.findNode($currNode,'objects-list')->getAttribute("d").'</b></caption>'."\n"); fwrite($fh, ' <caption><b>'.findNode($currNode,'objects-list')->getAttribute("d").'</b></caption>'."\n");
fwrite($fh, ' <thead>'."\n"); fwrite($fh, ' <thead>'."\n");
fwrite($fh, ' <tr>'); fwrite($fh, ' <tr>');
fwrite($fh, '<td bgcolor="#d1d1d1">№</td>'); fwrite($fh, '<td style="background-color:#d1d1d1;">№</td>');
$nextnode=findNode($currNode,'objects-list')->firstChild; $nextnode=findNode($currNode,'objects-list')->firstChild;
$col=0; $col=0;
while ($nextnode) while ($nextnode)
{ if ($nextnode->nodeName=='column') { if ($nextnode->nodeName=='column')
{ fwrite($fh, '<td bgcolor="#d1d1d1" width="'.$nextnode->getAttribute("width").'px"><b>'.$nextnode->getAttribute("d")."</b></td>"); { fwrite($fh, '<td style="background-color:#d1d1d1;" width="'.$nextnode->getAttribute("width").'px"><b>'.$nextnode->getAttribute("d")."</b></td>");
} }
$nextnode = $nextnode->nextSibling; $nextnode = $nextnode->nextSibling;
} }

8
metadata/dbms/editrecord.js
View File

@ -144,7 +144,7 @@ class EdtRec
str+=' <table class="SEdit" id="eTable'+this.uid+'" border="0px" cellspacing="1" cellpadding="1" style="width: 100%; height: 100%;">'; str+=' <table class="SEdit" id="eTable'+this.uid+'" border="0px" cellspacing="1" cellpadding="1" style="width: 100%; height: 100%;">';
str+=' <caption><b id="caption'+this.uid+'"></b></caption>'; str+=' <caption><b id="caption'+this.uid+'"></b></caption>';
str+=' <thead>'; str+=' <thead>';
str+=' <tr bgcolor="#dadada">'; str+=' <tr style="background-color:#dadada;">';
str+=' <th style="width:20%">'+trt('Name')+'</th>'; str+=' <th style="width:20%">'+trt('Name')+'</th>';
str+=' <th style="width:80%">'+trt('Value')+'</th>'; str+=' <th style="width:80%">'+trt('Value')+'</th>';
str+=' </tr>'; str+=' </tr>';
@ -935,7 +935,7 @@ class EdtRec
let win=new TWin(); let win=new TWin();
win.BuildGUI(pageX-10,pageY-10); win.BuildGUI(pageX-10,pageY-10);
let str=` let str=`
<table id="thetable`+win+`" bgcolor="SlateGrey" style="border: 1px solid rgb(99, 99, 99);" width="100%"> <table id="thetable`+win+`" style="background-color:SlateGrey;border: 1px solid rgb(99, 99, 99);" width="100%">
<caption></caption> <caption></caption>
<thead><tr><th></th></tr></thead> <thead><tr><th></th></tr></thead>
<tbody><tr><td></td></tr></tbody> <tbody><tr><td></td></tr></tbody>
@ -1168,7 +1168,7 @@ class EdtRec
}else }else
if(count>1) //Display the item selection window. if(count>1) //Display the item selection window.
{ {
let htmlString='<table width="100%" bgcolor="whitesmoke">'; let htmlString='<table width="100%" style="background-color:whitesmoke;">';
nodeProp=nodeType.firstChild; nodeProp=nodeType.firstChild;
let i=0; let i=0;
while (nodeProp!=null) while (nodeProp!=null)
@ -1182,7 +1182,7 @@ class EdtRec
value=value.replace(/"/g, "&quot;"); value=value.replace(/"/g, "&quot;");
value=value.replace(/'/g, "\\'"); value=value.replace(/'/g, "\\'");
value=value.replace(/\n/g, " "); value=value.replace(/\n/g, " ");
htmlString+='<tr><td bgColor="'+bgColor+'" onClick="setPropVal('+this.uid+',\''+id+'\',\''+value+'\',\''+prop_name+'\');" style="cursor: pointer;">'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'</td></tr>'+"\n"; htmlString+='<tr><td onClick="setPropVal('+this.uid+',\''+id+'\',\''+value+'\',\''+prop_name+'\');" style="background-color:"'+bgColor+'";cursor: pointer;">'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'</td></tr>'+"\n";
i++; i++;
} }
nodeProp=nodeProp.nextSibling; nodeProp=nodeProp.nextSibling;

2
metadata/dbms/records.xyz
View File

@ -1252,7 +1252,7 @@
$col=0; $col=0;
while ($nextnode) while ($nextnode)
{ if ($nextnode->nodeName=='column') { if ($nextnode->nodeName=='column')
{ fwrite($fh, '<td bgcolor="#d1d1d1" width="'.$nextnode->getAttribute("width").'px"><b>'.$nextnode->getAttribute("d")."</b></td>"); { fwrite($fh, '<td style="background-color:#d1d1d1;" width="'.$nextnode->getAttribute("width").'px"><b>'.$nextnode->getAttribute("d")."</b></td>");
} }
$nextnode = $nextnode->nextSibling; $nextnode = $nextnode->nextSibling;
} }

9
metadata/dbms/showrecord.js
View File

@ -360,7 +360,8 @@ class SRec
id=nodeProp.getAttribute("id"); id=nodeProp.getAttribute("id");
value=getCdataValue(nodeProp); value=getCdataValue(nodeProp);
value=value.replace(/"/g, "&quot;"); value=value.replace(/'/g, "\\'"); value=value.replace(/"/g, "&quot;"); value=value.replace(/'/g, "\\'");
htmlString+='<tr><td bgColor="'+bgColor+'" onClick="setFilterVal('+this.uid+',\''+id+'\',\''+value+'\',\''+prop_id+'\')" style="cursor: pointer;">'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'&nbsp;</td></tr>'+"\n";
htmlString+='<tr><td onClick="setFilterVal('+this.uid+',\''+id+'\',\''+value+'\',\''+prop_id+'\')" style="cursor:pointer;background-color:'+bgColor+';">'+findFirstNode(nodeProp, '#cdata-section').nodeValue+'&nbsp;</td></tr>'+"\n";
i++; i++;
} }
nodeProp=nodeProp.nextSibling; nodeProp=nodeProp.nextSibling;
@ -1296,9 +1297,9 @@ class SRec
}; };
//when you click on a cell, the sent filter is prefilled with variables in accordance with the id of the pressed line //when you click on a cell, the sent filter is prefilled with variables in accordance with the id of the pressed line
//in the function we pass the cell id and the column number //in the function we pass the cell id and the column number
td.onclick=function(obj,val1,val2){ td.onclick=function(thiz,val1,val2){
return function(){ return function(){
obj.callWindow(val1,val2); thiz.callWindow(val1,val2);
} }
}(this,id,colN); }(this,id,colN);
}else }else
@ -1453,10 +1454,10 @@ class SRec
{ {
if(nodeCol.nodeName=="column") if(nodeCol.nodeName=="column")
{ {
i++;
if(nodeCol.getAttribute("n")==name){ if(nodeCol.getAttribute("n")==name){
break; break;
} }
i++;
} }
nodeCol = nodeCol.nextSibling; nodeCol = nodeCol.nextSibling;
} }

2
metadata/dbms/window.js
View File

@ -120,7 +120,7 @@ class TWin
hd+='<table style="width: 100%;">'; hd+='<table style="width: 100%;">';
hd+=' <tr>'; hd+=' <tr>';
hd+=' <td style="vertical-align:bottom;cursor:move;" id="TWin_H1_'+this.tWinId+'"><img src="'+this.path+'/metadata/dbms/form/t1.gif" style="width: 20px; height: 20px; display: block;" alt="" border="0px" draggable="false"/></td>'; hd+=' <td style="vertical-align:bottom;cursor:move;" id="TWin_H1_'+this.tWinId+'"><img src="'+this.path+'/metadata/dbms/form/t1.gif" style="width: 20px; height: 20px; display: block;" alt="" border="0px" draggable="false"/></td>';
hd+=' <td align="center" width="100%" bgcolor="#3366CC" style="font-weight: bold; cursor:move; background: #92b5df url('+this.path+'/metadata/dbms/form/1.gif) repeat-x top;" id="TWin_H2_'+this.tWinId+'"><nobr id="TWin_Ca_'+this.tWinId+'"></nobr></td>'; hd+=' <td align="center" width="100%" style="background-color:#3366CC;font-weight: bold; cursor:move; background: #92b5df url('+this.path+'/metadata/dbms/form/1.gif) repeat-x top;" id="TWin_H2_'+this.tWinId+'"><nobr id="TWin_Ca_'+this.tWinId+'"></nobr></td>';
hd+=' <td style="vertical-align:bottom;cursor:move;" id="TWin_H3_'+this.tWinId+'"><img src="'+this.path+'/metadata/dbms/form/t2.gif" alt="" style="width: 20px; height: 20px; display: block;" border="0px" draggable="false"/></td>'; hd+=' <td style="vertical-align:bottom;cursor:move;" id="TWin_H3_'+this.tWinId+'"><img src="'+this.path+'/metadata/dbms/form/t2.gif" alt="" style="width: 20px; height: 20px; display: block;" border="0px" draggable="false"/></td>';
//hd+=' <td width="100%">&nbsp;</td>'; //hd+=' <td width="100%">&nbsp;</td>';
hd+=' <td style="vertical-align:bottom;cursor:pointer;"><img src="'+this.path+'/metadata/dbms/form/none.gif" alt="" style="width: 21px; height: 21px; display: block;" border="0px" draggable="false"/></td>'; hd+=' <td style="vertical-align:bottom;cursor:pointer;"><img src="'+this.path+'/metadata/dbms/form/none.gif" alt="" style="width: 21px; height: 21px; display: block;" border="0px" draggable="false"/></td>';

2
metadata/include/mpdf-6.1/CHANGELOG.txt
View File

@ -322,7 +322,7 @@ Bidi override codes supported - Right-to-Left Embedding [RLE] U+202B, Left-to-Ri
U+202C POP DIRECTIONAL FORMATTING (PDF) U+202C POP DIRECTIONAL FORMATTING (PDF)
Support for <base href=""> in HTML - uses it to SetBasePath for relative URLs. Support for <base href=""> in HTML - uses it to SetBasePath for relative URLs.
HTML tag - added support for <wbr> or <wbr /> - converted to a soft-hyphen HTML tag - added support for <wbr> or <wbr /> - converted to a soft-hyphen
CSS now takes precedence over HTML attribute e.g. <table bgcolor="black" style="background-color:yellow"> CSS now takes precedence over HTML attribute e.g. <table style="background-color:yellow">

4
metadata/test.xyz
View File

@ -13,13 +13,13 @@
<table class="SEdit" id="app0" border="0px" cellspacing="1" cellpadding="1" style="width: 100%; height: 100%;"> <table class="SEdit" id="app0" border="0px" cellspacing="1" cellpadding="1" style="width: 100%; height: 100%;">
<caption><b id="caption'+this.uid+'"></b></caption> <caption><b id="caption'+this.uid+'"></b></caption>
<thead> <thead>
<tr bgcolor="#dadada"> <tr style="background-color:#dadada;">
<th style="width:20%">trt('Name')</th> <th style="width:20%">trt('Name')</th>
<th style="width:80%">trt('Value')</th> <th style="width:80%">trt('Value')</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr bgcolor="#dadada"> <tr style="background-color:#dadada;">
<td style="width:20%">trt('Name')</td> <td style="width:20%">trt('Name')</td>
<td style="width:80%">trt('Value')</td> <td style="width:80%">trt('Value')</td>
</tr> </tr>

2
metadata/update/get.php
View File

@ -3,7 +3,7 @@
<title>Синхронизация</title> <title>Синхронизация</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
</head> </head>
<body bgColor="#FFFFDD"> <body style="background-color:#FFFFDD;">
<?php <?php
//Для переодического запрашивания данных с другого сервера и обновления локальной базы //Для переодического запрашивания данных с другого сервера и обновления локальной базы
//ini_set('max_execution_time',600);//устанавливаем время работы скрипта //ini_set('max_execution_time',600);//устанавливаем время работы скрипта

4
metadata/update/reports.xml
View File

@ -10,10 +10,10 @@
<proc n="Cities"/><!--Процедура для выборки данных--> <proc n="Cities"/><!--Процедура для выборки данных-->
<presentation> <presentation>
<head><![CDATA[ <head><![CDATA[
<table id="table0" width="100%" border="0px" cellspacing="1px" cellpadding="2px" bgcolor="#000000" style="border: 0px solid rgb(0, 0, 0);"> <table id="table0" width="100%" border="0px" cellspacing="1px" cellpadding="2px" style="border: 0px solid rgb(0, 0, 0);background-color:#000000;">
<caption></caption> <caption></caption>
<thead> <thead>
<tr bgcolor="#AAAAFF"> <tr style="background-color:#AAAAFF;">
<th width="40%">ПАСПОРТНЫЕ ДАННЫЕ</th> <th width="40%">ПАСПОРТНЫЕ ДАННЫЕ</th>
<th></th> <th></th>
</tr> </tr>