Skip to content

Commit 97347e2

Browse files
committed
new major release for local save changes
save the array in json format
1 parent 9d52344 commit 97347e2

14 files changed

+321
-93
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.bak
22
*.0
3+
*.1
34
*.prj
45
*.pui
56
*.demosource/conf/*.0

class/cap.form.class.php

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,10 @@ function InputStandard($type, $status_arr = "")
543543
$out.= substr($soap_SVG, 0, -6); // SVG from the SOAP
544544
//$out.= '<svg id="notme">';
545545
$out.= '<defs><filter id="css_brightness"><feComponentTransfer id="css_brightness"><feFuncR type="linear" slope="0.5"/><feFuncG type="linear" slope="0.5"/><feFuncB type="linear" slope="0.5"/></feComponentTransfer></filter></defs>';
546+
547+
//$out.= '<defs><filter id="css_test"><feComponentTransfer id="css_test"><feFuncR type="linear" slope="0.5"/><feFuncG type="linear" slope="0.5"/><feFuncB type="linear" slope="0.5"/></feComponentTransfer></filter></defs>';
548+
549+
546550
if(is_array($ParameterArray['AWT']))
547551
foreach($ParameterArray['AWT'] as $id => $type_arr)
548552
{
@@ -609,7 +613,7 @@ function InputStandard($type, $status_arr = "")
609613

610614
$out.= '<div class="ui-bar">';
611615
$out.= '<ul data-role="listview" data-divider-theme="b">'; // as long as it is without Area show 50% alpha
612-
$out.= '<li data-role="list-divider" data-theme="b" style="padding: 15px;">';
616+
$out.= '<li data-role="list-divider" data-theme="b" style="padding: 25px;">';
613617
if(empty($plugin->name))
614618
$out.= '<a id="submit_cap" href="" data-role="button" class="ui-btn ui-shadow ui-corner-all ui-btn-a" style="float: right; background-color: #065c00;color: white;text-shadow: none;border: 1px solid black;">';
615619
else
@@ -657,9 +661,13 @@ function InputStandard($type, $status_arr = "")
657661
$out.= '</div>';
658662
$out.= '</div>';
659663

664+
$out.= '<div id="symbol" style="display:none;"><img src="icon.png" alt="symbol" class="symbol" style="height:30px;position:relative;margin-top:-55px;margin-left:5px;"></img></div>';
665+
666+
$out.= '<div id="timer" style="display:none;position:relative;top:-67px;left:41px;color:white;font-size:16px;font-family:monospace;text-decoration:none;"></div>';
667+
660668
$out.= '<div data-role="popup" id="CAP_Send_popupDialog" data-overlay-theme="a" data-theme="a" data-dismissible="false" style="max-width:400px;">';
661669
$out.= '<div data-role="header" id="CAP_Send_popupDialog_header" data-theme="a">';
662-
$out.= '<h2>'.$langs->trans('SendCaps').'</h2>';
670+
$out.= '<h2>'.$langs->trans('Send Caps').'</h2>';
663671
$out.= '</div>';
664672
$out.= '<div role="main" id="CAP_Send_popupDialog_main" class="ui-content">';
665673
$out.= $langs->trans('Send Caps to Meteoalarm?');
@@ -679,13 +687,18 @@ function InputStandard($type, $status_arr = "")
679687
$out.= '</div>';
680688
$out.= '</div>';
681689

690+
691+
692+
693+
682694
$out.= '<div data-role="popup" id="CAP_SOAP_popupDialog" data-overlay-theme="a" data-theme="a" data-dismissible="true" style="max-width:400px;">';
683695
$out.= '<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-left">Close</a>';
684696
$out.= '<div data-role="header" id="CAP_SOAP_popupDialog_header" data-theme="a">';
685697
if(!empty($plugin->name)) $out.= '<h2>'.$langs->trans('ProducedCaps').'</h2>';
686-
else $out.= '<h2>'.$langs->trans('SOAPCaps').'</h2>';
698+
else $out.= '<h2>'.$langs->trans('Success!').'</h2>';
687699
$out.= '</div>';
688700
$out.= '<div role="main" id="CAP_SOAP_popupDialog_main" class="ui-content" style="max-height: 500px; overflow: auto;">';
701+
$out.= '<p class="success_message" style="text-align:center;border:5px solid green;padding:10px 10px 10px 10px;font-size:18px;">Your warnings were successfully sent to Meteoalarm</p>';
689702
$out.= '<ul data-role="listview" data-inset="true" data-shadow="false" id="SOAPUL">';
690703
$out.= '</ul>';
691704
$out.= '</div>';
@@ -701,13 +714,17 @@ function InputStandard($type, $status_arr = "")
701714
$out.= '</div>';
702715
$out.= '</div>';
703716

717+
/*
704718
$out.= '<div data-role="popup" id="MeteoalarmCalc_popupDialog" data-overlay-theme="a" data-theme="a" data-dismissible="false" style="max-width:400px;">';
705719
$out.= '<div data-role="header" id="MeteoalarmCalc_popupDialog_header" data-theme="a">';
706720
$out.= '<h2 style="color: yellow;">'.$langs->trans('Meteoalarm Soap').'</h2>';
707721
$out.= '</div>';
722+
*/
723+
/*
708724
$out.= '<div role="main" id="MeteoalarmCalc_popupDialog_main" class="ui-content" style="max-height: 500px; overflow: auto;">';
709725
$out.= $langs->trans('MeteoalarmCalc');
710726
$out.= '</div>';
727+
*/
711728
$out.= '</div>';
712729
break;
713730

@@ -1575,7 +1592,7 @@ function InputStandard($type, $status_arr = "")
15751592

15761593
if((empty($configuration->conf["webservice_aktive"]) || $configuration->conf["webservice_aktive"] == -1) && $configuration->conf["webservice"]["service_on"] == 1 && $this->login_id == 1)
15771594
{
1578-
$out.= '
1595+
$out.= '
15791596
<script>
15801597
$( document ).ready(function(){
15811598
$(".Login input").on("keyup",function(event){
@@ -1598,7 +1615,6 @@ function InputStandard($type, $status_arr = "")
15981615
$( "#Login-alert" ).popup();
15991616
setTimeout( function(){ $( "#Login-alert" ).popup("open"); }, 500 );
16001617
});
1601-
16021618
</script>
16031619
';
16041620
}

class/cap.updater.class.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@ function webservice_meteoalarm()
235235
{
236236
$res = true;
237237
$_GET['data'] = $this->data;
238+
239+
//echo $this->data;
240+
238241
require_once 'includes/nusoap/lib/nusoap.php'; // Include SOAP if not alredy
239242

240243
if(file_exists('lib/cap.meteoalarm.webservices.Area.php')) // test if the lib exists
@@ -262,6 +265,12 @@ function webservice_meteoalarm()
262265
if(!empty($AreaCodesArray['document']['AreaInfo']))
263266
{
264267
$this->AreaCodesArray = $AreaCodesArray['document']['AreaInfo'];
268+
//print_r($AreaCodesArray);
269+
//print_r($this->AreaCodesArray);
270+
//echo 'AreaCodesArray contains: ' .count($this->AreaCodesArray). ' elements';
271+
//exit;
272+
273+
265274
}
266275
else
267276
{
@@ -323,7 +332,6 @@ function get_area_identifier()
323332
print '</pre>';
324333
}
325334

326-
//
327335
foreach($this->AreaCodesArray as $key => $vl_warn)
328336
{
329337
// Add to the Area ID Array the Level and Type info from the VL Warnigns
@@ -338,6 +346,8 @@ function get_area_identifier()
338346
$this->cap_ident[$vl_warn['type']][$vl_warn['EMMA_ID']]['timestamp'] = $vl_warn['timestamp'];
339347
//die(print_r($this->cap_ident));
340348
}
349+
//print_r($this->AreaCodesArray);
350+
//die();
341351

342352
// Output Debug values
343353
if($this->debug == true)
@@ -357,6 +367,9 @@ function get_area_identifier()
357367
*/
358368
function calc_cap_update()
359369
{
370+
371+
//print_r($this->cap_array);
372+
360373
if($this->debug == true)
361374
{
362375
print '<pre>';

css/cap_form.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,4 +460,11 @@ textarea{
460460
#MapDiv {
461461
width: 100% !important;
462462
}
463-
}
463+
}
464+
p.success_message {
465+
text-align: center;
466+
border: 4px solid #098500;
467+
padding: 10px 10px 10px 0px;
468+
font-size: 18px;
469+
}
470+

icon.png

1.9 KB
Loading

includes/jquery.mobile/jquery.mobile-1.4.5.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)