Merge branch 'master' of bn.git:plabudda/se

SE/se-lib/V.php

@@ -494,6 +494,8 @@ EOF';
 
 		$kwota = (!substr_count($kwota, '.')) ? $kwota.'.00' : $kwota;
 		list($zlote, $grosze) = explode('.', $kwota);
+		$zlote = ltrim($zlote, '0');
+		if ($zlote == '') $zlote = '0';
 		if (strlen($grosze) == 1) $grosze .= "0";
 		elseif (strlen($grosze) > 2) $grosze = round(substr($grosze, 0, 2).".".substr($grosze, 2), 0);
 		$zlote = strrev(wordwrap(strrev($zlote), 3, '.', true));
@@ -509,8 +511,9 @@ EOF';
 			else $odmiana = 1;
 			if ($setka) $resultArr[] = $setka;
 			if ($dziesiatka) $resultArr[] = $dziesiatka;
-			$resultArr[] = $jednosc;
-			$resultArr[] = $tysiace[$tysiac][$odmiana];
+			if ($jednosc == $jednosci[0] && $zlote != '0') $jednosc = '';
+			if ($jednosc) $resultArr[] = $jednosc;
+			if ($setka || $dziesiatka || $jednosc || $tysiac == 0) $resultArr[] = $tysiace[$tysiac][$odmiana];
 		}
 
 		$resultArr[] = $grosze . "/100";

SE/sql-dev/biale_plamy.sql

@@ -0,0 +1,57 @@
+DROP FUNCTION `test_find_shortest_way`;
+CREATE DEFINER=`root`@`94.158.130.34` FUNCTION `test_find_shortest_way`(`pID` INT) RETURNS POINT NOT DETERMINISTIC READS SQL DATA SQL SECURITY DEFINER BEGIN
+
+    DECLARE A, B, P POINT;
+    DECLARE I, N INT;
+    
+    SET P = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_punkty_adresowe` WHERE `ID` = pID);
+
+    SET @the_geom = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_drogi` WHERE st_distance(`the_geom`, P) < 0.01 ORDER BY st_distance(`the_geom`, P) LIMIT 1);
+    IF @the_geom IS NULL THEN
+        SET @the_geom = (SELECT `the_geom` FROM `Rozdzielcza_test_bzyk_drogi` WHERE st_distance(`the_geom`, P) < 0.1 ORDER BY st_distance(`the_geom`, P) LIMIT 1);
+    END IF;
+
+    SET N = coalesce(numpoints(@the_geom), 0);
+    IF N < 2 THEN
+        RETURN NULL;
+    END IF;
+
+    IF N = 2 THEN
+        SET @line = @the_geom;
+    ELSE
+        SET @distance = NULL;
+        SET I = 1;
+        WHILE (I < N) DO
+            SET A = pointn(@the_geom, I);
+            SET B = pointn(@the_geom, I+1);
+            SET @line_cur = LineStringFromText(concat('LineString(',X(A),' ',Y(A),',',X(B),' ',Y(B),')'));
+            SET @distance_cur = st_distance(P, @line_cur);
+            IF @distance is NULL or @distance_cur < @distance THEN
+                SET @distance = @distance_cur;
+                SET @line = @line_cur;
+            END IF;
+            SET I = I + 1;
+        END WHILE;
+    END IF;
+
+    SET A = pointn(@line, 1);
+    SET B = pointn(@line, 2);
+
+    SET @A1 = (Y(A)-(Y(B)))/(X(A)-X(B));
+    SET @B1 = Y(A)-@A1*X(A);
+    SET @A2 = -1/@A1;
+    SET @B2 = Y(P)-@A2*X(P);
+    SET @X = (@B2-@B1)/(@A1-@A2);
+    SET @Y = @A1*@X+@B1;
+
+    SET @XPOINT = geomfromtext(concat('POINT(',@X,' ',@Y,')'));
+    SET @distance = st_distance(@XPOINT, @line);
+    IF @distance = st_distance(@XPOINT, A) THEN
+        SET @result = A;
+    ELSEIF @distance = st_distance(@XPOINT, B) THEN
+        SET @result = B;
+    ELSE
+        SET @result = @XPOINT;
+    END IF;
+    RETURN @result;
+END

SE/superedit-ANALIZA_HISTORII_ALL.php

@@ -484,6 +484,8 @@ if(V::get('DBG', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;bor
 								$sql="insert ignore into _ANALIZA_HISTORII_ALL( TABLE_NAME, TABLE_ID,FIELD,VALUE,A_RECORD_CREATE_DATE,A_RECORD_CREATE_AUTHOR,A_RECORD_UPDATE_DATE,A_RECORD_UPDATE_AUTHOR ) values (
 								  '{$RTH_A['TABLE_HIST']}','{$h->ID_USERS2}','{$field}','".DB::_($value)."','{$h->A_RECORD_CREATE_DATE}','{$h->A_RECORD_CREATE_AUTHOR}','{$h->A_RECORD_UPDATE_DATE}','{$h->A_RECORD_UPDATE_AUTHOR}' )";
 								  //echo "<br>".$sql;
+								  if(V::get('DBG', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;">$sql (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';echo $sql;echo'</pre>';}
+
 								  DB::query($sql) or die($sql);
 								  }
 								
@@ -515,6 +517,8 @@ if(V::get('DBG', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;bor
 	if ($_GET['A_RECORD_UPDATE_DATE']) {
 		$res = $db->query($ZAP_SQL['SQL']);
 	}
+	if(V::get('DBG', '', $_GET)) DEBUG_S(-3,'ZAP_SQL[SQL]',$ZAP_SQL['SQL'],__FILE__,__FUNCTION__,__LINE__);
+
 
 	$ARR = array();
 	if ($res) {

SE/superedit-DB_PROCEDURES_CREATE.php

@@ -1141,6 +1141,54 @@ END
 ";
 
 
+
+
+
+
+$sql['replace__RozdzielczaObiekty_wiev']="create or replace definer=`root`@`localhost` view RozdzielczaObiekty_wiev as
+select concat('rp5mm',ID) as ID, 'Rozdzielcza_Pakiet5MikrorurekMagistrala_WSG84' as TABLE_name, ID as TABLE_ID,  A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom 
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+from Rozdzielcza_Pakiet5MikrorurekMagistrala_WSG84
+union 
+select concat('rmk',ID) as ID, 'Rozdzielcza_Mikrokanalizacja_do_klienta' as TABLE_name, ID as TABLE_ID, A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR from Rozdzielcza_Mikrokanalizacja_do_klienta
+
+union
+select concat('rsw',ID) as ID, 'Rozdzielcza_struktura_wewnetrzna_wsg84' as TABLE_name, ID as TABLE_ID, A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom 
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+from Rozdzielcza_struktura_wewnetrzna_wsg84
+
+union
+select concat('rwk',ID) as ID, 'Rozdzielcza_wewn_kabel_ethernet' as TABLE_name, ID as TABLE_ID, A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom 
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+from Rozdzielcza_wewn_kabel_ethernet 
+
+
+union
+select concat('rr',ID) as ID,  'Rozdzielcza_rurociag_wsg84' as TABLE_name, ID as TABLE_ID,A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom 
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+from Rozdzielcza_rurociag_wsg84 
+
+
+union
+select concat('rwp',ID) as ID, 'Rozdzielcza_Wykop_przedmiar_na_mikrorurki' as TABLE_name, ID as TABLE_ID, A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom 
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+from Rozdzielcza_Wykop_przedmiar_na_mikrorurki 
+
+
+union
+select concat('rks',ID) as ID, 'Rozdzielcza_Kabel_Swiatlowodowy_wsg84' as TABLE_name, ID as TABLE_ID, A_STATUS, A_STATUS_INFO, L_APPOITMENT_USER, L_APPOITMENT_INFO, A_ADM_COMPANY, A_CLASSIFIED, the_geom
+, A_RECORD_UPDATE_DATE, A_RECORD_UPDATE_AUTHOR, A_RECORD_CREATE_DATE, A_RECORD_CREATE_AUTHOR
+ from Rozdzielcza_Kabel_Swiatlowodowy_wsg84 
+
+
+";
+
+
+
+
+
+
 foreach($sql as $ind=>$sql_) {
 	DEBUG_S(-3,'wykonuje zapytanie sql dla '.$ind,$sql_,__FILE__,__FUNCTION__,__LINE__);
 	if(!empty($DB)) {

SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -2390,7 +2390,7 @@ jQuery(document).ready(function(){
 					<tr>
 						<th style="vertical-align:top;font-size:16px;">Podaj skrót ulicy, dla jakiej chcesz wyszukać dostępne oferty</th>
 						<td style="padding:0 3px;vertical-align:top;">
-							<input type="text" name="S_ADDRESS_STREET" size="10" id="frm_S_ADDRESS_STREET" value="<?php echo $_GET['S_ADDRESS_STREET']; ?>">
+							<input type="text" name="S_ADDRESS_STREET" size="50" id="frm_S_ADDRESS_STREET" value="<?php echo $_GET['S_ADDRESS_STREET']; ?>">
 						</td>
 						<td style="vertical-align:top;">
 							<div id="frm_S_ADDRESS_STREET_values"></div>