Commit b9c23fc2 authored by GrondinDam's avatar GrondinDam
Browse files

Merge branch 'copedia' into pixelhumain-development2

parents 6c27892f 76814c2c
......@@ -89,13 +89,9 @@ function activateGlobalCommunexion(active, firstLoad){
showTagsScopesMin();
bindCommunexionScopeEvents();
// TODO search interop
if(actionOnSetGlobalScope=="filter"){
if(location.hash.indexOf("#live") >=0)
startNewsSearch(true);
else if(location.hash.indexOf("#interoperability") >= 0)
mylog.log('On ne lance pas le startSearch normal');
else if(!firstLoad)
startSearch(0, indexStepInit,searchCallback);
}
......
......@@ -670,7 +670,6 @@ var directory = {
dirLog : false,
defaultPanelHtml : function(params){
mylog.log("----------- defaultPanelHtml",params, params.type,params.name, params.url);
if(directory.dirLog) mylog.log("----------- defaultPanelHtml",params.type,params.name);
str = "";
str += "<div class='col-lg-4 col-md-6 col-sm-6 col-xs-12 searchEntityContainer "+params.type+" "+params.elTagsList+" "+params.elRolesList+" '>";
str += "<div class='searchEntity' id='entity"+params.id+"'>";
......@@ -1743,22 +1742,18 @@ var directory = {
directory.colPos = "left";
mylog.log("LE DIRECTORY : ", directory);
mylog.log("LE PARAM DATA : ", data, typeof(data));
if(typeof data == "object" && data!=null)
$.each(data, function(i, params) {
if(directory.dirLog) mylog.log("params", params, typeof params);
mylog.log("params", params, typeof params);
// if(params["_id"] != null || params["id"] != null){
if ((typeof(params.id) == "undefined") && (typeof(params["_id"]) !== "undefined")) {
params['id'] = params['_id'];
} else if (typeof(params.id) == "undefined") {
params['id'] = Math.random();
params['type'] = "poi";
}
// }
mylog.log("params", params["name"] , params.name, params.id, params["id"], typeof params["id"]);
......@@ -1859,23 +1854,12 @@ var directory = {
params.htmlIco = getImageIcoForInteropElements(interop_type);
params.type = "poi.interop."+interop_type;
mylog.log('PARAMS POUR UN ELEMENT INTEROP', params);
mylog.log('PARAMS SIZE', params.size);
//params.url = '#page.type.'+params.type+'.id.' + params.id;
// params.hash = '#page.type.'+params.type+'.id.' + params.id;
/*if(params.type == "poi")
params.hash = '#element.detail.type.poi.id.' + params.id;*/
if (typeof params.tags == "undefined")
params.tags = [];
params.tags.push(interop_type);
params.tags.push(interop_type);
} else {
params.hash = '#page.type.'+params.type+'.id.' + params.id;
if(params.type == "poi")
params.hash = '#element.detail.type.poi.id.' + params.id;
}
params.onclick = 'urlCtrl.loadByHash("' + params.url + '");';
......@@ -1912,7 +1896,6 @@ var directory = {
params.updated = notEmpty(params.updatedLbl) ? params.updatedLbl : null;
if(directory.dirLog) mylog.log("template principal",params,params.type, itemType);
mylog.log("template principal",params,params.type, itemType);
//template principal
if(params.type == "cities")
......
......@@ -37,10 +37,6 @@
};
}();
function dotClick() {
alert('ON CLIQUE SUR UN POINT DE LA FRISE !!!! ');
}
var TimelineChart = function () {
function TimelineChart(element, data, opts, label_dbpedia, wikidataID) {
_classCallCheck(this, TimelineChart);
......@@ -51,8 +47,6 @@
var options = this.extendOptions(opts);
mylog.log('OPTION DANS TIMELINE JS!!!!!!!!!!!!!!!!!!!! : ' , label_dbpedia);
var allElements = data.reduce(function (agg, e) {
return agg.concat(e.data);
}, []);
......@@ -153,7 +147,6 @@
svg.call(tip);
dots.on('mouseover', tip.show).on('mouseout', tip.hide);
dots.on('click', function() {
// console.log(d3.tip().attr('class', 'd3-tip').val());
mylog.log('LE FOCUS EST SUR : ', $(".n")[0].innerHTML);
displayDetailModal($(".n")[0].innerHTML);
});
......@@ -296,5 +289,4 @@
};
module.exports = TimelineChart;
});
//# sourceMappingURL=timeline-chart.js.map
});
\ No newline at end of file
......@@ -33,9 +33,6 @@ function saveCookieMultiscope(){
$.cookie('multiscopes', JSON.stringify(myMultiScopes), { expires: 365, path: location.pathname });
/*if(location.hash.indexOf("#city.detail")==0)
urlCtrl.loadByHash("#default.live");*/
if(location.hash.indexOf("#interoperability")!==0) {
}
}
function autocompleteMultiScope(){
......@@ -437,8 +434,6 @@ function setGlobalScope(scopeValue, scopeName, scopeType, scopeLevel,
if(actionOnSetGlobalScope == "filter"){
if(location.hash.indexOf("#live") >= 0)
startNewsSearch(true);
else if (location.hash.indexOf("#interoperability") >= 0)
mylog.log('On ne lance pas le StartSearch normal');
else if(location.hash != "")
startSearch(0, indexStepInit, searchCallback);
//else loadLiveNow();
......
......@@ -145,7 +145,6 @@
//mylog.log("markerName", markerName);
var iconUrl = assetPath+'/images/sig/markers/icons_carto/'+markerName+'.png';
// mylog.log('FMKZJMFLKEMFLK : ', thisData);
if(typeof thisData.profilMarkerImageUrl !== "undefined" && thisData.profilMarkerImageUrl != ""){
iconUrl = baseUrl + thisData.profilMarkerImageUrl;
}
......
......@@ -55,10 +55,8 @@
onclick = 'urlCtrl.loadByHash("'+url+'");';
// mylog.log('LA DATA POUR LA MAP', data);
if (type.substr(0,11) == "poi.interop") {
var icons = '<i class="fa fa-folder-open fa-'+ color +'"></i>';
// var icons = '<i class="fa fa-folder-open fa-'+ color +'"></i>';
url = data.url;
popupContent += "<a href='"+url+"' target='_blank' class='item_map_list popup-marker' id='popup"+id+"'>";
}else if (typeof TPL_IFRAME != "undefined" && TPL_IFRAME==true){
......
......@@ -106,16 +106,16 @@ class CommunecterController extends Controller
),
"adminpublic" => array(
"index" => array("href" => "/ph/communecter/adminpublic/index"),
"adddata" => array("href" => "/ph/communecter/adminpublic/adddata"),
"adddataindb" => array("href" => "/ph/communecter/adminpublic/adddataindb"),
"createfile" => array("href" => "/ph/communecter/adminpublic/createfile"),
"sourceadmin" => array("href" => "/ph/communecter/adminpublic/sourceadmin"),
"assigndata" => array("href" => "/ph/communecter/adminpublic/assigndata"),
"getdatabyurl" => array("href" => "/ph/communecter/adminpublic/getdatabyurl"),
"previewdata" => array("href" => "/ph/communecter/adminpublic/previewdata"),
"interopproposed" => array("href" => "/ph/communecter/adminpublic/interopproposed"),
"cleantags" => array("href" => "ph/communecter/adminpublic/cleantags"),
"index" => array("href" => "/ph/co2/adminpublic/index"),
"adddata" => array("href" => "/ph/co2/adminpublic/adddata"),
"adddataindb" => array("href" => "/ph/co2/adminpublic/adddataindb"),
"createfile" => array("href" => "/ph/co2/adminpublic/createfile"),
"sourceadmin" => array("href" => "/ph/co2/adminpublic/sourceadmin"),
"assigndata" => array("href" => "/ph/co2/adminpublic/assigndata"),
"getdatabyurl" => array("href" => "/ph/co2/adminpublic/getdatabyurl"),
"previewdata" => array("href" => "/ph/co2/adminpublic/previewdata"),
"interopproposed" => array("href" => "/ph/co2/adminpublic/interopproposed"),
"cleantags" => array("href" => "ph/co2/adminpublic/cleantags"),
),
"collections" => array(
"add" => array("href" => "/ph/co2/collections/add"),
......@@ -513,14 +513,14 @@ class CommunecterController extends Controller
"rooms" => array('href' => "/ph/co2/app/rooms", "public" => true),
"survey" => array('href' => "/ph/co2/app/survey", "public" => true),
"interoperability" => array(
"index" => array('href' => 'ph/communecter/interoperability/index', "public" => true),
"get" => array('href' => 'ph/communecter/interoperability/get', "public" => true),
"copedia" => array('href' => 'ph/communecter/interoperability/copedia', "public" => true),
"co-osm" => array('href' => 'ph/communecter/interoperability/co-osm', "public" => true),
"co-osm-getode" => array('href' => 'ph/communecter/interoperability/co-osm-getnode', "public" => true),
"wikitoco" => array('href' => 'ph/communecter/interoperability/wikitoco', "public" => true),
"pushtypewikidata" => array('href' => 'ph/communecter/interoperability/pushtypewikidata', "public" => true),
"wikidata-put-description" => array('href' => 'ph/communecter/interoperability/wikidata-put-description', "public" => true),
"index" => array('href' => 'ph/co2/interoperability/index', "public" => true),
"get" => array('href' => 'ph/co2/interoperability/get', "public" => true),
"copedia" => array('href' => 'ph/co2/interoperability/copedia', "public" => true),
"co-osm" => array('href' => 'ph/co2/interoperability/co-osm', "public" => true),
"co-osm-getode" => array('href' => 'ph/co2/interoperability/co-osm-getnode', "public" => true),
"wikitoco" => array('href' => 'ph/co2/interoperability/wikitoco', "public" => true),
"pushtypewikidata" => array('href' => 'ph/co2/interoperability/pushtypewikidata', "public" => true),
"wikidata-put-description" => array('href' => 'ph/co2/interoperability/wikidata-put-description', "public" => true),
),
),
"siteurl" => array(
......
......@@ -152,19 +152,6 @@
"placeholderMainSearch" : "Rechercher des données venus d'ailleurs ..."
},
"#test": {
"inMenu" : false,
"useHeader" : true,
"open" : true,
"subdomain" : "test2",
"subdomainName" : "test2",
"hash" : "#app.test",
"icon" : "database",
"mainTitle" : "Module de test",
"placeholderMainSearch" : " TEST ..."
},
"#rooms": {
"inMenu" : false,
"useHeader" : false,
......
......@@ -245,11 +245,6 @@ class AppController extends CommunecterController {
echo $this->renderPartial("interoperability", array(), true);
}
public function actionTest2() {
CO2Stat::incNbLoad("co2-test2");
echo $this->renderPartial("test2", array(), true);
}
public function actionInfo($p){
$CO2DomainName = isset(Yii::app()->params["CO2DomainName"]) ?
Yii::app()->params["CO2DomainName"] : "CO2";
......
......@@ -14,7 +14,6 @@ class ExportController extends CommunecterController {
);
}
}
?>
\ No newline at end of file
......@@ -5,7 +5,6 @@ class CO2 {
$domainName = @$domainName ? $domainName : Yii::app()->params["CO2DomainName"];
$layoutPath ="../../modules/co2/config/".$domainName."/params.json";
// $layoutPath ="../../modules/co2/config/CO2/params.json";
$str = file_get_contents($layoutPath);
......@@ -68,7 +67,6 @@ class CO2 {
$communexion["cities"] = $cities;
}
$communexion["communexionType"] = CookieHelper::getCookie("communexionType");
$communexion["currentName"] = $communexion["values"]["cityName"];
$communexion["currentValue"] = $communexion["values"]["city"];
......@@ -78,7 +76,6 @@ class CO2 {
$communexion["currentName"] = false;
$communexion["currentValue"] = false;
}
// var_dump($communexion);
return $communexion;
......
......@@ -3,10 +3,6 @@ $cs = Yii::app()->getClientScript();
$cssAnsScriptFilesModule = array(
'/plugins/jsonview/jquery.jsonview.js',
'/plugins/jsonview/jquery.jsonview.css',
//'/assets/js/sig/geoloc.js',
/*'/assets/js/dataHelpers.js',
'/assets/plugins/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css',
'/assets/plugins/bootstrap-switch/dist/js/bootstrap-switch.min.js'*/
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesModule,Yii::app()->request->baseUrl);
......@@ -18,7 +14,6 @@ $layoutPath = 'webroot.themes.'.Yii::app()->theme->name.'.views.layouts.';
$this->renderPartial($layoutPath.'header',
array( "layoutPath"=>$layoutPath ,
"page" => "admin") );
?>
<div id="main-container-proposition" class="container-all-proposition col-xs-12 bg-white">
......@@ -74,13 +69,8 @@ $this->renderPartial($layoutPath.'header',
"<td data-value='"+value.userID+"'> " + value.userID + "</td>"+
"<td data-value='"+value.description+"'>"+ value.description +
"<td>"+
// "<form class='status_form'>"+
// "<input type='radio' name='status' value='rejected'> Rejeter </input><br>" +
// "<input type='radio' name='status' value='accepted'> Accepter </input>"+
// // "<input class='btn-validate_status' data-id='"+index+"' type='submit' name='status' value='Valider'</input>"+
// "</form>"+
"<button id='"+index.toString()+"' style='margin-bottom:5px; text-align='center'; class='btn btn-success btn_validate_status' data-status ='accepted' data-id='"+index.toString()+"'>Valider</button><br>"+
"<button id='"+index.toString()+"' style='text-align:center;' class='btn btn-danger btn_validate_status' data-status='rejected' data-id='"+index.toString()+"'>Rejeter</button>"+
"<button id='"+index.toString()+"' style='margin-bottom:5px; text-align='center'; class='btn btn-success btn_validate_status' data-status ='accepted' data-id='"+index.toString()+"'>Valider</button><br>"+
"<button id='"+index.toString()+"' style='text-align:center;' class='btn btn-danger btn_validate_status' data-status='rejected' data-id='"+index.toString()+"'>Rejeter</button>"+
"</td>" +
"</tr>"
)
......@@ -127,8 +117,6 @@ function ValidateStatus(id_propose, status) {
} else {
alert('Vous avec avorté la validation ou le rejet de la proposition');
}
// }
}
</script>
......
......@@ -131,8 +131,6 @@ $this->renderPartial($layoutPath.'header',
padding:10px;
}
.logo_interop {
margin-top: 10px;
margin-bottom: 10px;
......@@ -186,10 +184,6 @@ $this->renderPartial($layoutPath.'header',
background-color: transparent;
}
#col-btn-type-directory .btn-directory-type .btn-all{
/*background-color: #F2F2F2;*/
}
.btn-select-filliaire:hover{
background-color: #F2F2F2;
}
......@@ -231,11 +225,6 @@ $this->renderPartial($layoutPath.'header',
<i class="fa <?php echo $cat["icon"]; ?> fa-2x hidden-xs"></i><br><?php echo $cat["name"]; ?>
</button>
</div>
<?php //foreach ($cat as $key2 => $cat2) { ?>
<!-- <button class="btn btn-default text-dark margin-bottom-5 margin-left-15 hidden keycat keycat-<?php //echo $key; ?>">
<i class="fa fa-angle-right"></i> <?php //echo $cat2; ?>
</button><br class="hidden"> -->
<?php //} ?>
<?php } ?>
</button>
<?php } ?>
......@@ -328,7 +317,6 @@ $this->renderPartial($layoutPath.'header',
"eco_doct" : { color: "blue", icon: "bullhorn", name: "Ecole doctorales accrédité" },
"membres_univ" : { color: "blue", icon: "bullhorn", name: "Membres des universités de France" },
"struct_recherche" : { color: "blue", icon: "bullhorn", name: "Structures de recherche" },
}
if( typeof themeObj != "undefined" && typeof themeObj.headerParams != "undefined" )
......@@ -463,27 +451,6 @@ $this->renderPartial($layoutPath.'header',
var city_wikidataID = city_data.wikidataID;
var city_insee = city_data.insee;
// if ($.cookie().communexionActivated == true) {
// city_id = getCityId();
// city_data = getCityDataById(city_id);
// var geoShape = getGeoShapeForOsm(communexion.values.geoShape);
// var geofilter = getGeofilterPolygon(communexion.values.geoShape);
// var city_wikidataID = communexion.values.wikidataID;
// var city_insee = communexion.values.inseeCode;
// } else {
// city_id = getCityId();
// // scope_value = getScopeValue();
// city_data = getCityDataById(city_id);
// // getCityDataByInsee(scope_value);
// var geoShape = getGeoShapeForOsm(city_data.geoShape);
// var geofilter = getGeofilterPolygon(city_data.geoShape);
// var city_wikidataID = city_data.wikidataID;
// var city_insee = city_data.insee;
// }
mylog.log("LE NOUVEAU GEOSHAPE : ", geoShape);
if (searchTags !== "") {
var libelle_activity = getLibelleActivity();
var amenity_filter = getAmenityFilter();
......@@ -566,16 +533,12 @@ $this->renderPartial($layoutPath.'header',
}
}
mylog.log('URL INTEROP', url_interop);
return url_interop;
}
function startSearchInterop(indexMin, indexMax) {
mylog.log("StartSearch INTEROPERABILITY");
if (typeof(typeD) == "undefined") {
// toastr.error("Pas de type de directory selectionné");
typeD = "wikidata";
}
......@@ -603,8 +566,6 @@ $this->renderPartial($layoutPath.'header',
if(levelCommunexion == 3) locality = inseeCommunexion;
if(levelCommunexion == 4) locality = inseeCommunexion;
if(levelCommunexion == 5) locality = "";
mylog.log("Locality : ", locality);
}
}
......@@ -621,7 +582,7 @@ $this->renderPartial($layoutPath.'header',
function getInteropResults(url_interop) {
mylog.log("nouvelle url à passer dans l'auro complete : ", url_interop);
mylog.log("nouvelle url à passer dans l'auto complete : ", url_interop);
loadingData = true;
......@@ -629,8 +590,6 @@ $this->renderPartial($layoutPath.'header',
$(".btn-start-search").html(str);
$(".btn-start-search").addClass("bg-azure");
$(".btn-start-search").removeClass("bg-dark");
mylog.log("L INDEX MIN EST EGAL A : ", indexMin);
if(indexMin > 0)
$("#btnShowMoreResult").html("<i class='fa fa-spin fa-circle-o-notch'></i> Recherche en cours ...");
......@@ -704,7 +663,6 @@ $this->renderPartial($layoutPath.'header',
searchType.push(typeD);
}
$.each(searchType, function(key, val){
mylog.log(headerParams[val]);
var params = headerParams[val];
str += "<span class='text-"+params.color+"'>"+
"<i class='fa fa-"+params.icon+" hidden-sm hidden-md hidden-lg padding-5'></i> <span class='hidden-xs'>"+params.name+"</span>"+
......@@ -722,8 +680,6 @@ $this->renderPartial($layoutPath.'header',
str += "<hr style='float:left; width:100%;'/>";
str += "</div>";
mylog.log("LE NOMBRE D'ELEMENT DANS LE PART_DATA", Object.keys(part_data).length);
if ((Object.keys(part_data).length > 0 && typeD == "all_interop") || (typeD !== "all_interop") ){
str += directory.showResultsDirectoryHtml(part_data);
......@@ -755,8 +711,6 @@ $this->renderPartial($layoutPath.'header',
//si on n'est pas sur une première recherche (chargement de la suite des résultat)
if(indexMin > 0){
mylog.log("ON CHARGE LA SUITE DES RESULTATS");
//on supprime l'ancien bouton "afficher plus de résultat"
$("#btnShowMoreResult").remove();
//on supprimer le footer (avec nb résultats)
......@@ -773,7 +727,6 @@ $this->renderPartial($layoutPath.'header',
//si on est sur une première recherche
}else{
//on affiche le résultat à l'écran
mylog.log("ON CHARGE LES PREMIERS RESULTATS");
$("#dropdown_search").html(str);
......@@ -945,7 +898,6 @@ $this->renderPartial($layoutPath.'header',
title : "Proposez vos sources Open Data",
icon : "fa-group",
afterSave : function(data){
mylog.log("ON LANCE L'AFTER SAVE", data);
dyFObj.closeForm();
},
properties : {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment