Commit 0af78843 authored by Raph El's avatar Raph El
Browse files

Merge branch 'development' of https://github.com/pixelhumain/co2 into development

parents bcc670a5 fbc36569
This diff is collapsed.
......@@ -886,10 +886,13 @@ var directory = {
if(typeof(params.statusLink)!="undefined"){
if(typeof(params.statusLink.isAdmin)!="undefined" && typeof(params.statusLink.isAdminPending)=="undefined")
str+="<span class='text-red'>Administrateur</span>";
if(typeof(params.statusLink.isAdmin)!="undefined" && typeof(params.statusLink.isAdminPending)=="undefined" && typeof(params.statusLink.isAdminInviting)=="undefined")
str+="<span class='text-red'>"+trad.administrator+"</span>";
if(typeof(params.statusLink.isAdminInviting)!="undefined"){
str+="<span class='text-red'>"+trad.invitingToAdmin+"</span>";
}
if(typeof(params.statusLink.toBeValidated)!="undefined" || typeof(params.statusLink.isAdminPending)!="undefined")
str+="<span class='text-red'>En attente de validation</span>";
str+="<span class='text-red'>"+trad.waitingValidation+"</span>";
}
if(params.rolesLbl != "")
......
dynForm = {
jsonSchema : {
title : typeObj.addAny.title,
icon : typeObj.addAny.icon,
noSubmitBtns : true,
properties : {
sectionBtn :{
label : tradDynForm.what+" ? ",
inputType : "tagList",
placeholder : "Choisir un type",
list : typeObj.addAny.sections,
trad : tradCategory,
init : function(){
$(".sectionBtn").off().on("click",function()
{
dyFObj.openForm($(this).data('key'));
});
//manage update bulding here
}
},
}
}
};
\ No newline at end of file
dynForm = {
jsonSchema : {
title : typeObj.apps.title,
icon : typeObj.apps.icon,
noSubmitBtns : true,
properties : {
sectionBtn :{
inputType : "tagList",
list : typeObj.apps.sections,
trad : tradCategory,
init : function(){
$(".sectionBtn").off().on("click",function()
{
urlCtrl.loadByHash($(this).data('key'));
});
}
},
}
}
};
\ No newline at end of file
dynForm = {
jsonSchema : {
title : typeObj.config.title,
icon : "cogs",
noSubmitBtns : true,
properties : {
sectionBtn :{
label : tradDynForm.whichkindofconfig+" ? ",
inputType : "tagList",
placeholder : "Choisir un type",
list : typeObj.config.sections,
trad : tradCategory,
init : function(){
$(".sectionBtn").off().on("click",function()
{
dyFObj.openForm($(this).data('key'));
});
//manage update bulding here
}
},
}
}
};
\ No newline at end of file
typeObj.config.sections = {
"sections" : {
"network" : { "label": "Network","key":"network","icon":"map-marker", "col":"network"}
}
};
dynForm = {
jsonSchema : {
title : typeObj.filter.title,
icon : typeObj.filter.title,
debug:true,
save : function () {
//alert("filter save "+dyFObj.activeModal);
if( typeof typeObj.network.filters == "undefined" )
typeObj.network.filters = [];
typeObj.network.filters.push( $("#openModal #ajaxFormModal").serializeFormJSON() );
//mylog.log(typeObj.network.filters);
$(".filterList").html("");
$.each(typeObj.network.filters,function(k,v) {
delete typeObj.network.filters[k].key;
delete typeObj.network.filters[k].collection;
delete typeObj.network.filters[k].id;
typeObj.network.filters[k].tags = typeObj.network.filters[k].tags.split(",");
$(".filterList").append(v.name+" <a href='javascript:;' onclick='typeObj.network.dynForm.removeFilter("+k+")'><i class='fa fa-times text-red'></i> </a><br/>");
})
$("#openModal").modal("hide");
dyFObj.activeModal = "#ajax-modal";
dyFObj.activeElem = "elementObj";
delete typeObj.filter.dynForm;
},
properties : {
info : {
inputType : "custom",
html:"<p class='text-red'>Les Filtres controle le menu de gauche et les tags que vous voulez présenter aux utilisateurs<hr></p>",
},
name : dyFInputs.name(),
tags : dyFInputs.tags()
}
}
};
\ No newline at end of file
dynForm = {
jsonSchema : {
title : typeObj.config.title,
icon : "cogs",
debug:true,
properties : {
info : {
inputType : "custom",
html:"<p class='text-red'>All DYNFORM existing inputs are all here <hr></p>",
},
type : dyFInputs.inputHidden(),
name : dyFInputs.name("network"),
"skin[title]" : dyFInputs.name(),
image : dyFInputs.image(),
"request[searchTag]" : dyFInputs.tags(),
tags : dyFInputs.tags(),
description : dyFInputs.textarea(tradDynForm.longDescription, "..."),
startDate :{
inputType : "datetime",
label : "Date de début",
placeholder : "Date de début"
},
endDate :{
inputType : "datetime",
label : "Date de fin",
placeholder : "Date de fin"
},
urls : dyFInputs.urls,
"result[displayImage]" : dyFInputs.radio( "Display Images ?", { "true" : { icon:"check-circle-o", lbl:trad.yes },
"false" : { icon:"circle-o", lbl:trad.no} } ),
//keyVal : dyFInputs.keyVal,
/*"linksTag[]" : dyFInputs.subDynform({
key : dyFInputs.name(),
tagParent : "Type",
"background-color" : "#f5f5f5",
"image" : "Travail.png",
"tags" : dyFInputs.tags(),
}, "multi"),*/
}
}
};
\ No newline at end of file
dynForm = {
removeFilter : function (ix) {
//alert(ix);
typeObj.network.filters.splice( ix, 1 );
$(".filterList").html("");
$.each(typeObj.network.filters,function( k,v ) {
$(".filterList").append(v.name+" <a href='javascript:;' onclick='typeObj.network.dynForm.removeFilter("+k+")'><i class='fa fa-times text-red'></i> </a><br/>");
})
},
jsonSchema : {
title : tradDynForm.configNetwork,
icon : "connectdevelop",
type : "object",
//debug : true,
beforeBuild : function(){
dyFObj.setMongoId('network',function(){
uploadObj.gotoUrl = location.hash;
});
},
afterSave : function(){
if( $('.fine-uploader-manual-trigger').fineUploader('getUploads').length > 0 )
$('.fine-uploader-manual-trigger').fineUploader('uploadStoredFiles');
else
{
dyFObj.closeForm();
urlCtrl.loadByHash( (uploadObj.gotoUrl) ? uploadObj.gotoUrl : location.hash );
}
},
canSubmitIf : function () {
return ( $("#ajaxFormModal #type").val() ) ? true : false ;
},
formatData : function(formData){
//alert("formatData");
if( $(dyFObj.activeModal+" #ajaxFormModal request[searchTag]").val() != "" && formData["request[searchTag]"] )
formData["request[searchTag]"] = formData["request[searchTag]"].split(",");
if( $(dyFObj.activeModal+" #ajaxFormModal add").val() != "" && formData.add )
formData.add = formData.add.split(",");
if( typeObj.network.filters )
formData.filters = typeObj.network.filters;
return formData;
},
properties : {
breadcrumb : {
inputType : "custom",
html:"<h4><a href='javascript:;'' class='btn btn-xs btn-danger' onclick='dyFObj.openForm(\"filr\")'><i class='fa fa-times'></i></a> NETWORK </h4>",
},
"type" : dyFInputs.inputHidden(),
"name" : dyFInputs.name(),
skinInfo : {
inputType : "custom",
html:"<p class='item-comment bg-green-comment'>SKIN Section<hr></p>",
},
"skin[title]" : dyFInputs.name(),
"skin[logo]" : dyFInputs.image(),
"skin[paramsLogo][origin]" : dyFInputs.checkboxSimple("true", "skinparamsLogoorigin",
{ "onText" : "Oui",
"offText": "Non",
"onLabel" : "on",
"offLabel": "off",
"inputId" : ".skinparamsLogoorigin",
"labelText": "skin params Logo origin ?",
"labelInInput": "Activer les amendements",
"labelInformation": "<i class='fa fa-info-circle'></i> Les votes sont désactivés pendant la période d'amendement"
}),
filterInfo : {
inputType : "custom",
html:"<p class='item-comment bg-green-comment'>FILTER Section "+
"</p>",
},
"filters[types]" : dyFInputs.radio( "Types ?", { "true" : { icon:"check-circle-o", lbl:trad.yes },
"false" : { icon:"circle-o", lbl:trad.no} } ),
filterTagsInfo : {
inputType : "custom",
html:"<a href='javascript:;' class='btn btn-dark' onclick='dyFObj.openForm(\"filter\",null,null,true)'><i class='fa fa-plus'></i> Ajouter un Filtre</a>"+
"<div class='filterList'></div>",
},
addInfo : {
inputType : "custom",
html:"<p class='item-comment bg-green-comment'>ADD Section</p>",
},
add : dyFInputs.tags( ["organization","project","event"] ),
resultInfo : {
inputType : "custom",
html:"<p class='item-comment bg-green-comment'>RESULT Section</p>",
},
"result[displayImage]" : dyFInputs.radio( "Display Images ?", { "true" : { icon:"check-circle-o", lbl:trad.yes },
"false" : { icon:"circle-o", lbl:trad.no} } ),
requestInfo : {
inputType : "custom",
html:"<p class='item-comment bg-green-comment'>REQUEST Section</p>",
},
"request[searchTag]" : dyFInputs.tags(),
}
}
};
\ No newline at end of file
......@@ -265,19 +265,49 @@ Liste des notifications déjà lues => #370 #453
- values
- fixed
- percentage
** Page dédié sondage avec le module de proposition
faire une page genre comme les change.org et autre
on fait un appel , venez nombreux donner votre avis, proposer vos idées, ou jsute etre présent à l'appel
sur la question du : ....blah blah
** Qui est là, Action en cours, Todo, Todo Perso : dans un e communauté
une vision à un temps t, de toutes les ressources d'une CO
- en mode web
- mobi
** menu configurable comme sur telephone , on click avatar
avec des widget , esay access links ...
possibilité de plusieurs panels
** idea build dynform based on final json analysis (retro build)
- entry param is a structure similare
* ************************************************************
* Version C0.22 : en cours
* ************************************************************
** @Tib
>>>>[ ] json builder
>>>> [ ] application launcher like linux
>>>> [ ] integration du system de paiement Mango
>>>> [ ] faciliter la création de page static
[ ] avec du contenu MD
[ ] un slideshow MD
** json config builder
- is just dynForm selector
- save allready gets the collection as a param in formatData
- any new saved Element must have a model and it's databinding at least
[X] select type of config ex : "network"
- onclick : openForm of the given type
- this way editing will also work
[ ] subDynform : open a subDF from any DF
- similar to location process
- on click opens a new modal with a dynform inside
[ ] bugs
[ ] btn annulé on subDF
>>>>[ ] removing dynform classes from co.js and lazy load them
>>>>[ ] check webpacking
>>>>[ ] suppression d'un element user type COEDitor
>>>>[ ] bug : preview POI
>>>>[ ] add parent class to POI types
[ ] poi le saviez vous , a utiliser dans les chargements
>>>>[ ] http://127.0.0.1/ph/co2/rocketChat/type/xxx/id/xxxx > open chat
>>>>[ ] presistent login issue , SSO ?
[ ] search fork the world > opens a preview POI > should have the parent link
[ ] verifier les qrcode
[ ] NA : supprimer
......@@ -292,11 +322,12 @@ Liste des notifications déjà lues => #370 #453
- on Update l'image dans le form edit > pas possible de supprimer l'image qu'on a précédement ajouté
* Finir module Tiers Lieux
[ ] on events TL connecté url to visio
[ ] partage de calendrier entre plusieurs TL connecté
[ ] show icons for quick access to ressources of a TL event
[ ] avoir des roles concirerge ...etc == RH
[ ] Compétence
* features
[ ] Ressource
[ ] Ressource [[[https://docs.google.com/drawings/d/17L1sZ0so3BHoV8fNclsCio9HflaAVkKP_Q1XhuUBhn4/edit]]]
[ ] temps de consommation d'une ressource
[ ] taux d'utilisation
[ ] Besoin
......@@ -309,10 +340,26 @@ Liste des notifications déjà lues => #370 #453
[ ] réintégré la GEd de granddir
[ ] losing session : rememberme
[ ] enable edit POI when open Edition
* ************************************************************
* Version CO.22.terlà : en cours
* ************************************************************
* ************************************************************
* Version C0.21.8 : MEP
8 correpsond le nb de nouvelle fonctionalité
......
......@@ -289,7 +289,7 @@ var newMemberInCommunity = false;
var isElementAdmin= "<?php echo Authorisation::isElementAdmin($parentId, $type, @Yii::app()->session["userId"]) ?>";
var contactTypes = [{ name : "people", color: "yellow", icon:"user", label:"Citoyens" }];
var listMails = {};
var rolesList=[tradCategory.financier,tradCategory.partner,tradCategory.sponsor,tradCategory.organizor,tradCategory.president, tradCategory.director,tradCategory.speaker,tradCategory.intervener];
var rolesList=[ tradCategory.financier, tradCategory.partner, tradCategory.sponsor, tradCategory.organizor, tradCategory.president, tradCategory.director, tradCategory.speaker, tradCategory.intervener];
if(elementType != "<?php echo Event::COLLECTION ?>" || isElementAdmin)
contactTypes.push({ name : "organizations", color: "green", icon:"group", label:"Organisations" });
......
......@@ -24,7 +24,7 @@
<?php if(@$confirmations["asAdmin"]){
foreach($confirmations["asAdmin"] as $key => $data){ ?>
<li class='notifLi'>
<a href='#person.detail.id.<?php echo $key ?>' class='notif lbh pull-left' style="line-height: 30px;">
<a href='#page.type.<?php echo Person::COLLECTION ?>.id.<?php echo $key ?>' class='notif lbh pull-left' style="line-height: 30px;">
<span class='label bg-dark'>
<i class="fa fa-cog"></i>
</span>
......@@ -67,7 +67,7 @@
<?php if(@$confirmations["asMember"]){
foreach($confirmations["asMember"] as $key => $data){ ?>
<li class='notifLi'>
<a href='#person.detail.id.<?php echo $key ?>' class='notif lbh pull-left' style="line-height: 30px;">
<a href='#page.type.<?php echo Person::COLLECTION ?>.id.<?php echo $key ?>' class='notif lbh pull-left' style="line-height: 30px;">
<span class='label bg-dark'>
<i class="fa fa-group"></i>
</span>
......
......@@ -132,18 +132,29 @@
if(@$invitedMe && !empty($invitedMe)){
$inviteRefuse="Refuse";
$inviteAccept="Accept";
$tooltipAccept="Join this ".Element::getControlerByCollection($type);
$verb="Join";
$labelAdmin="";
$option=null;
$linkValid=Link::IS_INVITING;
if(@$invitedMe["isAdminInviting"]){
$verb="Administrate";
$option="isAdminInviting";
$labelAdmin=" to administrate";
$linkValid=Link::IS_ADMIN_INVITING;
}
$labelInvitation=Yii::t("common", "{who} invited you".$labelAdmin, array("{who}"=>"<a href='#page.type.".Person::COLLECTION.".id.".$invitedMe["invitorId"]."' class='lbh'>".$invitedMe["invitorName"]."</a>"));
$tooltipAccept=$verb." this ".Element::getControlerByCollection($type);
if ($type == Event::COLLECTION){
$inviteRefuse="Not interested";
$inviteAccept="I go";
}
echo "<div class='no-padding containInvitation' style='border-bottom: 1px solid lightgray;margin-bottom:10px !important;'>".
"<div class='padding-5'>".
"<a href='#page.type.".Person::COLLECTION.".id.".$invitedMe["invitorId"]."' class='lbh'>".$invitedMe["invitorName"]."</a><span class='text-dark'> vous a invité: <br/>".
'<a class="btn btn-xs tooltips btn-accept" href="javascript:;" onclick="validateConnection(\''.$type.'\',\''.(string)$element["_id"].'\', \''.Yii::app()->session["userId"].'\',\''.Person::COLLECTION.'\',\''.Link::IS_INVITING.'\')" data-placement="bottom" data-original-title="'.Yii::t("common",$tooltipAccept).'">'.
$labelInvitation.": <br/>".
'<a class="btn btn-xs tooltips btn-accept" href="javascript:;" onclick="validateConnection(\''.$type.'\',\''.(string)$element["_id"].'\', \''.Yii::app()->session["userId"].'\',\''.Person::COLLECTION.'\',\''.$linkValid.'\')" data-placement="bottom" data-original-title="'.Yii::t("common",$tooltipAccept).'">'.
'<i class="fa fa-check "></i> '.Yii::t("common",$inviteAccept).
'</a>'.
'<a class="btn btn-xs tooltips btn-refuse margin-left-5" href="javascript:;" onclick="disconnectTo(\''.$type.'\',\''.(string)$element["_id"].'\',\''.Yii::app()->session["userId"].'\',\''.Person::COLLECTION.'\',\''.Element::$connectTypes[$type].'\')" data-placement="bottom" data-original-title="'.Yii::t("common","Not interested by the invitation").'">'.
'<a class="btn btn-xs tooltips btn-refuse margin-left-5" href="javascript:;" onclick="disconnectTo(\''.$type.'\',\''.(string)$element["_id"].'\',\''.Yii::app()->session["userId"].'\',\''.Person::COLLECTION.'\',\''.Element::$connectTypes[$type].'\',null,\''.$option.'\')" data-placement="bottom" data-original-title="'.Yii::t("common","Not interested by the invitation").'">'.
'<i class="fa fa-remove"></i> '.Yii::t("common",$inviteRefuse).
'</a>'.
"</div>".
......
......@@ -66,6 +66,8 @@ var trad = {
"city" : "<?php echo Yii::t("common","City"); ?>",
"administrator" : "<?php echo Yii::t("common","Administrator") ?>",
"invitingToAdmin" : "<?php echo Yii::t("common","Invited to administrate") ?>",
"waitingValidation" : "<?php echo Yii::t("common","Waiting for validation") ?>",
"Member" : "<?php echo Yii::t("common","Member") ?>",
"justCitizen" : "<?php echo Yii::t("common","Just a citizen wanting to give visibility to it :)") ?>",
......@@ -323,6 +325,8 @@ var trad = {
};
var tradDynForm = {
"appList":"<?php echo Yii::t("form","List of Applications") ?>",
"screenList":"<?php echo Yii::t("form","Screen shot View to Application") ?>",
"me":"<?php echo Yii::t("form","Me") ?>",
"dontknow":"<?php echo Yii::t("form","I don't know") ?>",
"syntaxmarkdownused":"<?php echo Yii::t("form","Markdown syntax is used for description. If you want to <a href='https://michelf.ca/projets/php-markdown/syntaxe/'' target='_blank'>know more about</a>") ?>",
......@@ -359,8 +363,10 @@ var tradDynForm = {
"description":"<?php echo Yii::t("form","Description") ?>",
"addtags":"<?php echo Yii::t("form","Add some tags") ?>",
"limitAccessRole":"<?php echo Yii::t("form","Limit role access") ?>",
"what":"<?php echo Yii::t("form","What") ?>",
"addroles":"<?php echo Yii::t("form","Add some roles") ?>",
"wantToAddSomething":"<?php echo Yii::t("form","choose what you want to add ?") ?>",
"imageshere":"<?php echo Yii::t("form","Your pictures here") ?>",
"fileshere":"<?php echo Yii::t("form","Your files here") ?>",
"pricesymbole":"<?php echo Yii::t("form","Price (£)") ?>",
......@@ -386,6 +392,8 @@ var tradDynForm = {
"secondLocality":"<?php echo Yii::t("common","Second locality") ?>",
"freeinfourl":"<?php echo Yii::t("form","Free informations / urls") ?>",
"addpoi":"<?php echo Yii::t("form","Create a point of interest") ?>",
"configNetwork":"<?php echo Yii::t("form","Configure your Network") ?>",
"addconfig":"<?php echo Yii::t("form","Create a config") ?>",
"addclassified":"<?php echo Yii::t("form","Create a classified") ?>",
"addurl":"<?php echo Yii::t("form","Add an url") ?>",
"addbookmark":"<?php echo Yii::t("form","Add a bookmark") ?>",
......@@ -397,6 +405,7 @@ var tradDynForm = {
"save":"<?php echo Yii::t("common","Save") ?>",
"whichkindofroom":"<?php echo Yii::t("form","Which kind of room do you want to create") ?>",
"whichkindofpoi":"<?php echo Yii::t("form","Which kind of point do you want to locate") ?>",
"whichkindofconfig":"<?php echo Yii::t("form","Which kind of config") ?>",
"whichkindofclassified":"<?php echo Yii::t("form","Which kind of classified is it") ?>",
"inwhichcategoryforclassified":"<?php echo Yii::t("form","In which category do you want to publish the classified") ?>",
"subcategory":"<?php echo Yii::t("form","Subcategory") ?>",
......
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