Skip to content

Commit

Permalink
Merge pull request #230 from 2p2r/POIfromViewPort
Browse files Browse the repository at this point in the history 
restrict the poi returned by the server that are on the current user viewport
bug corrected : emails were not sent to moderators for mobile observation creation
  • Loading branch information
@gerald2545
gerald2545 authored Oct 10, 2019
2 parents f94931d + 0c204eb commit bf8d731
Show file tree
Hide file tree
Showing 10 changed files with 278 additions and 112 deletions.
88 changes: 44 additions & 44 deletions admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<div class="loading-indicator">
<img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
</div>
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.2" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/geoext-all.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.6.2" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.2" />
<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />

<!--<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script>
Expand All @@ -51,9 +51,9 @@

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-<?php echo $_SESSION['extension_language']; ?>.js"></script>
<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.7.0"></script>
<script type="text/javascript" src="lib/js/key.js?v1.7.0"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js"></script>
Expand All @@ -67,63 +67,63 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading geometry...';</script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
<script type="text/javascript" src="lib/js/common.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/common.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.7.0"></script>
<?php
switch ($_SESSION['type']) {
case '1':
?>

<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/icon1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/config1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/status1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/users1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poi1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/category1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/users_link_pole1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/main1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/icon1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/config1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/status1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/users1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poi1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/category1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/users_link_pole1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/main1.js?v1.7.0"></script>

<?php
break;
case '2':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poi2.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poi2.js?v1.7.0"></script>

<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/main2.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/main2.js?v1.7.0"></script>
<?php
break;
case '3':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poi3.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/main3.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poi3.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/main3.js?v1.7.0"></script>
<?php
break;
case '4':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poi4.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/main4.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poi4.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/admin/main4.js?v1.7.0"></script>

<?php
break;
Expand Down
36 changes: 18 additions & 18 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<title><?php echo PAGE_TITLE ?> v1.6.3</title>
<title><?php echo PAGE_TITLE ?> v1.7.0</title>
<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
</head>
<body onunload="setCookie()">
Expand All @@ -15,14 +15,14 @@
<div class="loading-indicator">
<img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
</div>
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.3" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/geoext-all.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
<link rel="stylesheet" type="text/css" href="resources/css/public.css?v1.6.3" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.3" />
<link rel="stylesheet" type="text/css" href="resources/css/public.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.7.0" />
<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading ExtJS...';</script>
Expand All @@ -35,27 +35,27 @@

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-fr.js"></script>
<script type="text/javascript" src="lib/js/translation_fr.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6.3"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/translation_fr.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.7.0"></script>
<script type="text/javascript" src="lib/js/key.js?v1.7.0"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/poidisplaystatus.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/framework/ux/FileUploadField.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/framework/ux/IconCombo.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/poidisplaystatus.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/framework/ux/FileUploadField.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/framework/ux/IconCombo.js?v1.7.0"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading geometry...';</script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
<script type="text/javascript" src="lib/js/public/credits.js"></script>
<script type="text/javascript" src="lib/js/framework/AnimatedCluster.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/common.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/export.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.6.3"></script>
<script type="text/javascript" src="lib/js/framework/AnimatedCluster.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/common.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/export.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.7.0"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.7.0"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script>
</div>
Expand Down
Loading

0 comments on commit bf8d731

Please sign in to comment.