From 3f85d7710fedb1ca4d6fe4677528fc2c37591ed2 Mon Sep 17 00:00:00 2001
From: levinsv <44033647+levinsv@users.noreply.github.com>
Date: Wed, 25 Dec 2019 22:31:30 +0500
Subject: [PATCH] compare text fix

add event javascript
---
 Release_(3.0)/pgAdmin3.exe                | Bin 10777088 -> 10777088 bytes
 Release_(3.0)/textcompare_report.template |  54 ++++++++++++++++++++++
 frm/frmReport.cpp                         |   8 ++--
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/Release_(3.0)/pgAdmin3.exe b/Release_(3.0)/pgAdmin3.exe
index d2fadb51e79a80a7626acca8610451e39a5e7fae..4f6e58af72b720359334e6593861488f7e65a1b4 100644
GIT binary patch
delta 2291
zcmb8vdr(wW90%}w??UnlFU#`iv3Lb}SR`l|QY09Hy)-O)_$Zfsc$Pr8i(65lEfHQ+
zwj^nP^surQj1#q#b&P7-ok69>nU<z0oGIduCS}H{W-{HGtnGV2C9HosGoRga&;HKu
z{?6~-S<jDM(H`(CqJefA+Ok9~OB8vQD1GaYOkYt@GH3BQOiD>GuNmtVyes`jD$fcS
zM`j(k!7oHoK8YF^oR(3(dW-aazS&Ry88MyHF~V1bnBzQVpVVSDE6>jij4Hj5tYdUC
zkUBn-Hkj3m;_|2C4vum$AXSLw;frF{OvjuY)oOwg7$6Fw;SydGoHb!Ne>|-*Gln;2
z#%4Rs>P6+-r^|o!5FgkXTOlS5_sp#PJF46w{icOGV<8UWAptIhL>}&(eIz8^KE{Lh
z%j+aV&xu~ju*l2AugPMO+a|AnvdG0#*BMk=BU_D~htTO=C(-3dO6boY1m^+r*T}yk
z<}IuIczn73^UBcS%Cnc#FE;rys<g?*)Bsk`J&x&sE2jds+vL>5A>V}-BY^hX<buS|
z%(de-`Rc^+nQMw&F4N1@tacfazzE4;f)q%FG)RZb;BvSEt^_k=aI1aJwF&1MK97H_
z&iT1JJx_0>w>lDu;3QG!N<VPAmj|Pj7o(-n=lp?q<+UiosUyAIAS)%Jp}EITWl73@
z!}v%qxtcOkxnxuZR!FCO^ub!?8|mOMdDkgRM41k+Q`Xb_Yn5~=S+A@x41M0q+tw=|
z=jJYSDre9=uLZX~(bYO0@qBv4Uy+F5tsJd(GjIEkxNvryAxE2HH8dOg_!n)8CQ3(7
z(_QUKmXtq1&FzXW_ZsJLV&C~R!EOIY(^u`Tn@+QMyRvCA&CA=B55&1gPxlJdC-#j0
z5NR7qsP=kWa5o%2E0Pk>A2YJMI~1Q(KBgt?P+%@(LKe(}Y@V<qXQ0u5)@gxo4&*`}
z%!jMsYRKn-@HMGdO`iH#=7QPtL|L1tS^x!5$S0~6N`FkY_2*@asziOJ6;~{RYk6@+
z(S`;3PR-{kg2iwh6vGlIf$QN0D1{qgDfhX`<~?kX$xlhf%w#QeybQ`=8QcUFupBC(
z3Rb|)JaqgPzFNOMjZ~y1YkNy>h1=kESP84(4yfjPOICNi60g7GJH$=<h7R>=CC667
zop2YdfxF=zxEJn&wXhD>!v?q?9)OKtff}%a4ea3HCC4`H`7&PrdpkGyw|#7FR9Chf
zTW)KtZ)_?T1iGc4EvH~VOQukWDKx%KHBos#Gw~DsEKL#xpPwD1p#f&1qka~Sbqh6u
zRj3yn^!-OHi+&woZ<4E3P2+FB$MR=U^+s0=DXpqPc^)L{+vb!hJjR})@ae}A`G<pS
ze>8Q!$I_|Dqsn9%WU(~Ts^;o56D{^&UpT~yd@iTV3xg~vS{4cfx6mXk#R+Qd*>-^j
z##k}$ILzd@`0`r2yT)4Yux(ap;9YMTRd?4l#g`VSO^&6d1#bINTGm}x!qpMB{L<J}
zjc#StL-qA#G}59bQ{f0RlJzjlp`36-I*qrei{>gqqtGDOaJpK2)(JNXnfT5_0Zy!J
z5$4nEt!fHA>rhkarV*C$pBwBmHi*ABB<p1ra%G&|7eBT4oe+zoxBFS*|45MY;Yl_e
zcVWNjKezs?*lhjYJzD4t11HqNgHQ+cuo)V7=uD&Bu7|GSMO#&mSf=DD*>+{VaDFs6
z&d&tF;hLW7Gl$DrYqvWZ{;^6m{f{Kms$I<q$u{)PA#BE5qmKvCVXOXBZlhl-)fkEy
zWJ{)I&H!G%f<d+r&wdV_dY8#mwa;bLi&{XPx%Dv=@~AgY#qJKUJSrT-$7GT~faOz0
zkQuuQ<EB<l1z0Kan5M2;23fv#wp9feG{F{d!$a^eJOa(|C_Dy_Lkn!>XIr<O+%1~4
z3F8ysfmV1D+TbZ@hwY$22kd~IunRiD3s1u{up7GIS=a;J@ErJnpa-6Z7vM#B3HHLv
T@Cv*N``|Trolh9wNZa@~Jm$-G

delta 2089
zcmZA1dr(wW90%}w?=Fczc3F9;EnZkuR1z{wDO=VM?4gEfr9ibTcRh;`dm${%*DB)0
zVoQ|vr<Jd2!f|3+%sObVWk!)+(^}1_GX+fJBuq^GLuJ!r`(CtAcjhyD&$++*JHPWg
zcdqYZOOy|SifH;q6dP=!ZWBdr6Qy%*Y2Y{NlB_m9nMsLp*5kjm3H~L)GlhQ%_?;PZ
z{O+I-N&L{<FL+u%<IA3w-p#T)&tD(YJQ|a^m&!l3UgFV*rHxi==M918`Tr;D**6kM
zO`k|*)}b5XvPR>aUvn`e6^PdQudiQp#c0gs0lmCS0uz`a3U1=%U1J8F|7}nArblyc
z`q(KRt8hamb+r8O0PlEyELLl}p`!0bW3+t~|Alox|D$;<#6T>>!Obv^|IvI)cUa0f
z&AT3#OC;0rK#)?M@&eI8PN&>3GXBvi&%H8ErTOKu%Mv<`&Al*$jz<#1fA<NVQxq(h
ze?`n&E_p+2I1t34gu4s>nn=G?$P=irLbfFJWA^INj0W6#C16K|oHTCux&S&_A!m>4
z>}k8^A-Yr{&m1SywTVbk<$R+|-KEM94;B~?36Ka$kPIm>0VcvExD~9B%3bQ@JL0Z3
zKZAduP5!wxW%vws=`W5%BG`%fYU%6t26<PM@@kaSf0jQHtGsSD^<c^*D|w>ni%=Wo
z$16uAWglsEsmWZjC>@I^tyD>&&sQlS>C~s>FHz=+8g-W_rKa;|+bE+{DKiBr$Qw$P
z52j6<?CEbs_xw&QJJ7PVKjQmn(m#=i;4eI1T+jTC7cuZ;4U)S-ahaM=xAD&!6kU`S
z_tNr4#U?p=X<efdm^R6?cfhEABu&@mYtkGkuCE$RGiQggdL+$(9m;!R+Tz|ep?F|V
ze_y2GR9vy&zY(ip^R`H0$T((XuWwQU(zmDexSa~5K|0tV1E%n}ol`r!CbUiuU7iZl
zAQPs;444U7JaqZCq!}Z-zK}lamJCtT2a9GwHstWZqT8iEN80-Hg4so)aiz~Km<@OE
zxdpjpvy3P8Ky5C}fjeO?%!53*3+{&ba1Ypdpf*3_8IwjqinpYX*Ta|c!2t{4UMPTt
zPzXh^2=3$IOZW3-#`1KwAbGsLKkor}5EjD{SPBn8G2frJtmR;=@s95lS0BEJ*D>$H
zGI$u4!wPr=9)-tXC9HxHD1|b39G-wD!3pKyf(lT<&GRm--t$##k+;rW$!e4;_j-Qr
z2wP<~SE^G~>S<>Rt!QU?w8yO_(u+T_6r0`nEDH0p>s?-Ty&eDMu4=bE#+Vbbg?gb*
zu=DTRS-K?V2ZF3qa@SJtw=9XmK{iageyUEP#i}QThCA3{Di5(_{`N7JH706};1yi-
zWe2m7wncMLvFcH%GsF_8XRDUWkDO$kQ54*wWm1n%%OM4mq;1s}@|-Rf9~G0W)wzvg
zR6Dh}wPgCCmrdnO-As<5-EJ+3?0qaD)_%1_Rj||kc4lkIj;5gy%O$0cnJL`MEOelc
zrIPvA8kuWn*}|J?MK^9IoMf#OYFzUsSNhq?So-e1>ZbRHSWgW1rEZKC_3-ZuJWvU1
zpbDztDX8J$-@S69vB>PP|Cc~%mun{Q+)bKKv^gr(kuFv|r8$h|Dw)a@Rhe#F3XTeI
zwYSbeyq#I48h1<D#AtV|r&3kjH8iwY%P<<1OY#;?rsC~uqiLz?$)q^@+88RUs!A~K
zmIO|si@p$xz7iXDZHS^1y==TOoJYg&FqxWsnxiErn)*-Rz%iXet;bjjZ3?kiV>pMJ
zLM+F)lIhSnmZ4{D)1VgW;AyCbweSo)3+rG#JO>+KBW&VX+ctl=OSI^NmM!3et*{Lm
zU^_Iz4$z?qcEa=U0yKjkUWAum7qq}`*aNNbG6aBNFYJR?;8l1H_QL@<2#4S>ybf>h
KLCc%TPyP#%x}TN+

diff --git a/Release_(3.0)/textcompare_report.template b/Release_(3.0)/textcompare_report.template
index 93a8846..5bc11ac 100644
--- a/Release_(3.0)/textcompare_report.template
+++ b/Release_(3.0)/textcompare_report.template
@@ -237,10 +237,12 @@ label {
 		.has_difference { 
 			background: #97D397;
 			width: 1em;
+			user-select: none;
 		}
 		.diff_header, .diff_next {
 			vertical-align:top;
 			background: #dedede;
+			user-select: none;
 		}
 		.diff_next {padding-top:2px;}
 		.diff_remove {background: Pink;}
@@ -281,7 +283,59 @@ $tables$
 
 
         
+<script>       
+function c(t)
+{
+         console.log(t.parentNode)
+         console.log(t.parentNode.parentNode.parentNode)
+         var myTab= t.parentNode.parentNode.parentNode;
+         var text='';
+         var j=t.cellIndex;
+         console.log('cellIndex='+t.cellIndex);
+ 
+         for (i = 0; i < myTab.rows.length; i++) {
+          text = text + myTab.rows.item(i).cells.item(j+2).innerText +'\n';
+        }
+ 
+var node = document.createElement('textarea');
+          var selection = document.getSelection();
+ 
+          node.textContent = text;
+          document.body.appendChild(node);
+ 
+          selection.removeAllRanges();
+          node.select();
+          document.execCommand('copy');
+ 
+          selection.removeAllRanges();
+          document.body.removeChild(node);
+          alert('SQL copy to clipbord Length: '+text.length);
+}
+function d(t)
+{
+         console.log(t.parentNode)
+         
+         var myTab= t.parentNode.parentNode.parentNode;
+         var text='';
+         var j=t.cellIndex;
+         console.log('cellIndex='+t.cellIndex);
+ 
+         for (i = 0; i < myTab.rows.length; i++) {
+	  var sel=myTab.rows.item(i).cells.item(j+1);
+	  // sel.setAttribute("style", "color:grey; user-select: none;");
+          console.log(sel.style.userSelect);
+	  if (sel.style.userSelect=="") { sel.setAttribute("style", "color:grey; user-select: none;");}
+		 else 
+			{sel.style.userSelect = null; sel.style.color= null;}
 
+	  //console.log(sel.style)
+
+        }
+
+}
+
+ 
+</script>        
 
 
 </body></html>
diff --git a/frm/frmReport.cpp b/frm/frmReport.cpp
index d4fb3e3..01a97b4 100644
--- a/frm/frmReport.cpp
+++ b/frm/frmReport.cpp
@@ -1779,12 +1779,12 @@ std::wstring reportCompareFactory::printdiff(std::wstring str1, std::wstring str
 //					)&&(!modify)) modify=true;
 				// формируем колонки
 				//left
-					tableline+=L"<tr><td class=\"diff_next\"></td>";
-					 tableline+= modify ? L"<td class=\"has_difference\">"+ncur_l+"</td>" : L"<td class=\"diff_header\">"+ncur_l+"</td>";
+					tableline+=L"<tr><td class=\"diff_next\" onclick=\"c(this)\"></td>";
+					 tableline+= modify ? L"<td class=\"has_difference\" onclick=\"d(this)\">"+ncur_l+"</td>" : L"<td class=\"diff_header\" onclick=\"d(this)\">"+ncur_l+"</td>";
 					tableline+=L"<td class=\"lineContent\"><pre>"+t_cur_l+"</pre></td>";
 				// right
-				tableline+=L"<td class=\"diff_next\"></td>";
-				tableline+= modify ? L"<td class=\"has_difference\">"+ncur_r+"</td>" : L"<td class=\"diff_header\">"+ncur_r+"</td>";
+				tableline+=L"<td class=\"diff_next\" onclick=\"c(this)\"></td>";
+				tableline+= modify ? L"<td class=\"has_difference\" onclick=\"d(this)\">"+ncur_r+"</td>" : L"<td class=\"diff_header\" onclick=\"d(this)\">"+ncur_r+"</td>";
 				tableline+=L"<td class=\"lineContent\"><pre>"+t_cur_r+"</pre></td>";
 				tableline+=L"</tr>";