minor bug fixex, typo

2p2r · Apr 30, 2018 · 3585861 · 3585861
1 parent 1c22f0b
commit 3585861
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/INSTALL.odt b/INSTALL.odt
diff --git a/lib/js/key.js.template b/lib/js/key.js.template
@@ -70,7 +70,7 @@ var ClusterStrategyDistance = 30;
 var predefinedColorsForStatus = [['Vert','green'],['Noir','black'],['Rouge','red'],['Bleu','blue']];
 
 //fields to inactivate for each role (have a look at the install.odt file which lists all the ids usable in thes arrays
-var arrayComponentsToDisableRole1Admin = ["emailPOIField","StatusPOIField","RespComcomPOIField", "RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
-var arrayComponentsToDisableRole2CommunauteCommunes = ["emailPOIField","sendMailButton","SubCategoryPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField","PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
-var arrayComponentsToDisableRole3PoleTechnique = ["emailPOIField","sendMailButton","SubCategoryPOIField", "CommunePOIField", "PolePOIField", "RespComcomPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField", "PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
-var arrayComponentsToDisableRole4Moderateur = ["emailPOIField","StatusPOIField","RespComcomPOIField","RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
+var arrayComponentsToDisableRole1Admin = ["latitude","longitude","emailPOIField","StatusPOIField","RespComcomPOIField", "RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
+var arrayComponentsToDisableRole2CommunauteCommunes = ["RespPolePOIField","latitude","longitude","emailPOIField","sendMailButton","SubCategoryPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField","PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
+var arrayComponentsToDisableRole3PoleTechnique = ["latitude","longitude","emailPOIField","sendMailButton","SubCategoryPOIField", "CommunePOIField", "PolePOIField", "RespComcomPOIField", "DescPOIField", "PropPOIField", "RuePOIField", "ObsPOIField", "NumPOIField", "PrioritePOIField","CommentFinalPOIField","ModerationPOIField","DisplayPOIField"];
+var arrayComponentsToDisableRole4Moderateur = ["latitude","longitude","emailPOIField","StatusPOIField","RespComcomPOIField","RespPolePOIField","TraitePolePOIField","TransmissionPolePOIField"];
diff --git a/lib/js/public/map.js b/lib/js/public/map.js
@@ -1036,15 +1036,13 @@ var stylePole = new OpenLayers.StyleMap({'default':new OpenLayers.Style({
 })});
 var layerNewObservation = new OpenLayers.Layer.Vector("Propositions", { visibility: true, displayInLayerSwitcher: false});
 layerNewObservation.setZIndex(11);
-var layerLimitesGeographiquesCommunes = new OpenLayers.Layer.Vector("Limites communes", {reportError:true,styleMap:styleCommune, visibility: false, displayInLayerSwitcher: true,eventListeners:{
+var layerLimitesGeographiquesCommunes = new OpenLayers.Layer.Vector("Limites communes", {reportError:true,styleMap:styleCommune, visibility: true, displayInLayerSwitcher: true,eventListeners:{
 	"featureadded": function(feature) {
-		console.log(feature);
 	}
 }});
 layerLimitesGeographiquesCommunes.setZIndex(5);
-var layerLimitesGeographiquesPoles = new OpenLayers.Layer.Vector("Limites poles", {reportError:true,styleMap:stylePole, visibility: false, displayInLayerSwitcher: true,eventListeners:{
+var layerLimitesGeographiquesPoles = new OpenLayers.Layer.Vector("Limites poles", {reportError:true,styleMap:stylePole, visibility: true, displayInLayerSwitcher: true,eventListeners:{
 	"featureadded": function(feature) {
-		console.log(feature);
 	}
 }});
 layerLimitesGeographiquesPoles.setZIndex(3);
@@ -1426,12 +1424,14 @@ function setCookie() {
 var communesLoaded = 0;
 function displayLayerLimitesGeographiquesCommunes(){
 	console.log("displayLayerLimitesGeographiquesCommunes");
+	document.getElementById("loader").style.display = "block";
 	layerLimitesGeographiquesPoles.display(false);
 	layerLimitesGeographiquesCommunes.display(true);
 	if (communesLoaded == 0){
 		CommunePOIList.load();
 		communesLoaded=1;
 	}
+	document.getElementById("loader").style.display = "none";
 }
 function hideLayerLimitesGeographiquesCommunes(){
 	console.log("hideLayerLimitesGeographiquesCommunes");
@@ -1440,12 +1440,14 @@ function hideLayerLimitesGeographiquesCommunes(){
 var polesLoaded = 0;
 function displayLayerLimitesGeographiquesPoles(){
 	console.log("displayLayerLimitesGeographiquesPoles");
+	document.getElementById("loader").style.display = "block";
 	layerLimitesGeographiquesCommunes.display(false);
 	layerLimitesGeographiquesPoles.display(true);
 	if (polesLoaded == 0){
 		PolePOIList.load();
 		polesLoaded=1;
 	}
+	document.getElementById("loader").style.display = "none";
 }
 function hideLayerLimitesGeographiquesPoles(){
 	console.log("hideLayerLimitesGeographiquesPoles");
@@ -1489,13 +1491,10 @@ CommunePOIList.on('load', function(store, records, options){
 	CommunePOIList.each(function(record){
 		var coords = record.get("geom");
 		var commune = record.get("lib_commune");
-		console.log("commune="+commune);
 		if(coords != ''){	
 			addLimitesGeographiques(coords, layerLimitesGeographiquesCommunes, commune);					
 		}
 	}, this); 
-	console.log("commune ");
-//	publicMap.addLayer(layerLimitesGeographiquesCommunes);
 }); 
 PolePOIList.on('load', function(store, records, options){ 
 	var fieldValue; 

diff --git a/resources/upgrade/upgradeSQL-V1_5_2.php b/resources/upgrade/upgradeSQL-V1_5_2.php
@@ -33,7 +33,7 @@
 L''observation que vous avez envoyée sur VelObs a changé de statut. Le problème identifié a été transmis aux services municipaux.\n',besoin_commentaire_association = 0 WHERE id_priorite = 2;";
 	$resultUpdate = mysql_query ( $sqlUpdate );
 	echo $sqlUpdate . " : " . $resultUpdate . "<br />";
-	$sqlUpdate = "UPDATE priorite SET non_visible_par_collectivite = 0, non_visible_par_public = 1, priorite_sujet_email = '',priorite_corps_email = '',besoin_commentaire_association = 0 WHERE id_priorite = 4;";
+	$sqlUpdate = "UPDATE priorite SET non_visible_par_collectivite = 1, non_visible_par_public = 1, priorite_sujet_email = '',priorite_corps_email = '',besoin_commentaire_association = 0 WHERE id_priorite = 4;";
 	$resultUpdate = mysql_query ( $sqlUpdate );
 	echo $sqlUpdate . " : " . $resultUpdate . "<br />";
 	$sqlUpdate = "UPDATE priorite SET non_visible_par_collectivite = 1, non_visible_par_public = 0, priorite_sujet_email = 'Observation prise en compte',priorite_corps_email = 'Bonjour !