Skip to content

GitLab

Commit a781e0f8 authored by thomas craipeau's avatar thomas craipeau
Browse files

Merge branch 'development' into refactorCacheCostum

parents 63ed6130 48dbe3a6
Hide whitespace changes
Inline Side-by-side
views/co/answerList.php
View file @ a781e0f8
......@@ -239,14 +239,14 @@ function initWizard () {
//selected: 1,
keyNavigation: false,
//enableAllSteps : true,
//onLeaveStep: function(){ console.log("leaveAStepCallback");},
//onLeaveStep: function(){ },
onShowStep: function(obj, context)
{
console.log("test onShowStep",dySObj.navBtnAction,context.toStep,context.fromStep,Math.abs( context.toStep - context.fromStep));
if( !dySObj.navBtnAction ){
$(".section0"+dySObj.activeSection).addClass("hide");
dySObj.activeSection = context.toStep -1 ;
console.log("top wisard direct link",dySObj.activeSection);
$(".section"+dySObj.activeSection).removeClass("hide");
}
......@@ -285,7 +285,7 @@ function getAnswers(dynJson, noTotal)
$("."+updateForm.cat+"_"+updateForm.step+"ResultAnswer").html('');
}
$.each( dynJson.jsonSchema.properties , function(field,fieldObj) {
console.log($(this).data("step")+"."+field, $("#"+field).val() );
if( fieldObj.inputType ){
if(fieldObj.inputType=="uploader"){
listObject=$('#'+fieldObj.domElement).fineUploader('getUploads');
......@@ -315,7 +315,7 @@ function getAnswers(dynJson, noTotal)
$("."+updateForm.cat+"_"+updateForm.step+"ResultAnswer").append( "<td>"+$("#"+field).val()+"</td>" );
if(fieldObj.weight){
var w = 1 + (parseInt(fieldObj.weight) / 100);
console.log("w",w,"cal", parseFloat( parseInt( $("#"+field).val() ) / w ).toFixed(2) );
total += parseFloat( parseFloat( parseInt( $( "#"+field ).val() ) / w ).toFixed(2) );
}
else
......@@ -343,7 +343,7 @@ function getAnswers(dynJson, noTotal)
calcPrio( updateForm.cat );
calcTotal();
console.log("editAnswers",editAnswers);
return editAnswers;
}
......@@ -351,7 +351,7 @@ function calcPrio (key)
{
var t = 0;
$("."+key+"_Total").each( function(i,v){
//console.log(i,v);
t += parseFloat( $(v).html() );
} );
t = parseFloat( t / $("."+key+"_Total").length ).toFixed(2) ;
......@@ -388,7 +388,7 @@ function nextState(step,c) {
label: "Annuler",
className: "btn-default",
callback: function() {
console.log("Annuler");
}
},
danger: {
......@@ -464,7 +464,7 @@ function nextState(step,c) {
answerUser : adminAnswers.user
}
}).done( function (data) {
console.log("data",data);
//alert();
//window.location.reload();
});
......
views/co/answerScenario.php
View file @ a781e0f8
......@@ -391,7 +391,7 @@ $(document).ready(function() {
var editData = answers[$(this).data("form")]['answers'][$(this).data("step")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......
views/co/answersList.php
View file @ a781e0f8
......@@ -430,7 +430,7 @@ jQuery(document).ready(function() {
answerUser : userId
};
console.log("saving",postdata);
// /alert(answerId);
$.ajax({
type: "POST",
......@@ -493,7 +493,7 @@ function showFinancial(answerId){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......@@ -522,7 +522,7 @@ function commentAnswer(answerId){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/co/dossier.php
View file @ a781e0f8
......@@ -487,7 +487,7 @@ $(document).ready(function() {
answerUser : adminAnswers.user
};
console.log("save",data);
$.ajax({ type: "POST",
url: baseUrl+"/survey/co/update",
......@@ -550,7 +550,7 @@ function commentRisk(answerId, riskId){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/co/dossierEdit.php
View file @ a781e0f8
......@@ -357,7 +357,7 @@ $(document).ready(function() {
answerUser : adminAnswers.user
};
console.log("save",data);
$.ajax({ type: "POST",
url: baseUrl+"/survey/co/update",
......@@ -420,7 +420,7 @@ function commentRisk(answerId, riskId){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/co/dossierEdit2.php
View file @ a781e0f8
......@@ -391,7 +391,7 @@ $(document).ready(function() {
};
var editData = answers[$(this).data("form")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......
views/co/formScenario.php
View file @ a781e0f8
......@@ -391,7 +391,7 @@ $(document).ready(function() {
var editData = answers[$(this).data("form")]['answers'][$(this).data("step")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......
views/co/formScenario2.php
View file @ a781e0f8
......@@ -391,7 +391,7 @@ $(document).ready(function() {
var editData = answers[$(this).data("form")]['answers'][$(this).data("step")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......
views/co/index.php
View file @ a781e0f8
......@@ -244,7 +244,7 @@ jQuery(document).ready(function() {
answerUser : userId
};
console.log("save",data);
$.ajax({ type: "POST",
url: baseUrl+"/survey/co/update",
......
views/co/members.php
View file @ a781e0f8
......@@ -149,7 +149,7 @@ $adminTCO = Form::canSuperAdmin($form["id"], @$_GET["session"], $form);
//bindAnwserList();
// if(typeof data.results.count !="undefined")
// refreshCountBadge(data.results.count);
// console.log(data.results);
// if(initPage)
// initPageTable(data.results.count[searchAdmin.type]);
},
......@@ -165,12 +165,12 @@ $adminTCO = Form::canSuperAdmin($form["id"], @$_GET["session"], $form);
}
function initViewTable(data){
console.log("initViewTable", data);
$('#panelAdmin .directoryLines').html("");
console.log("valueInit",data);
$.each(data, function(key, value){
entry=buildDirectoryLine(key, value);
console.log("entry", entry);
$("#panelAdmin .directoryLines").append(entry);
bindMembers();
});
......@@ -323,7 +323,7 @@ $adminTCO = Form::canSuperAdmin($form["id"], @$_GET["session"], $form);
}
function buildDirectoryLine(key, value){
console.log("buildDirectoryLine", key, value);
actions = "";
str = '<tr id="lineMember'+key+'" class="line">';
str += '<td>'+value.name+'</td>';
......
views/co/priorisation.php
View file @ a781e0f8
......@@ -268,7 +268,7 @@ if(@$adminAnswers["categories"]){
};
var editForm = adminForm.scenario[$(this).data("step")].json;
console.log("editForm",editForm);
editForm.jsonSchema.onLoads = {
onload : function(){
......@@ -292,7 +292,7 @@ if(@$adminAnswers["categories"]){
total : true
};
console.log("save",data);
$.ajax({ type: "POST",
url: baseUrl+"/survey/co/update",
......
views/co/risk.php
View file @ a781e0f8
......@@ -194,7 +194,7 @@ function colorTitle () {
msg = "Le porteur devra justifier et proposer une parades à cet aspect du projet, il sera automatiquement informer et demander de répondre aprés cette action. "+msgAttention;
}
console.log("colorTitle",col ,icon ,msg );
$(".bootbox-body #explainProbGrav").html( "<i class='pull-left fa fa-3x "+icon+"'></i> "+msg ).css( "background-color",bgcol ).css( "color",txtcol );
}
......@@ -228,7 +228,7 @@ var riskObj = {
riskObj.selectedRisks[ riskId ].weight = riskObj.riskWeight[$('.inputprobGrav #probability').last().val()+""+$('.inputprobGrav #gravity').last().val()].w;
//riskObj.selectedRisks[ riskId ].comment = $('.inputprobGrav #comment').last().val();
modal.modal("hide");
console.log("riskObj.selectedRisks",riskObj.selectedRisks);
$("#noriskTtile").hide();
$("#riskList").show();
var line = "<tr id='srisk"+riskId+"'>"+
......@@ -256,7 +256,7 @@ var riskObj = {
answerUser : adminAnswers.user ,
date : true
};
console.log("saving",data);
$.ajax({
type: "POST",
url: baseUrl+"/survey/co/update",
......@@ -279,7 +279,7 @@ var riskObj = {
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......@@ -320,7 +320,7 @@ var riskObj = {
// answerUser : adminAnswers.user ,
// };
// console.log("saving",data);
// $.ajax({
// type: "POST",
// url: baseUrl+"/survey/co/update",
......
views/custom/cte.php
View file @ a781e0f8
......@@ -389,7 +389,7 @@ foreach ($sessions as $s => $sv) {
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/custom/cte/answersList.php
View file @ a781e0f8
......@@ -377,7 +377,7 @@ jQuery(document).ready(function() {
answerUser : userId
};
console.log("saving",postdata);
// /alert(answerId);
$.ajax({
type: "POST",
......@@ -421,7 +421,7 @@ function commentAnswer(answerId){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/custom/ctenat/contractualiser.php
View file @ a781e0f8
......@@ -324,7 +324,7 @@ $(document).ready(function() {
}
};
console.log("validation save",data);
dataHelper.path2Value( data, function(params) {
dyFObj.closeForm();
......@@ -375,7 +375,7 @@ $(document).ready(function() {
value : "<?php echo Ctenat::STATUT_ACTION_VALID ?>"
};
console.log("validation save",data);
dataHelper.path2Value( data, function(params) {
urlCtrl.loadByHash(location.hash);
......
views/custom/ctenat/dossierEdit.php
View file @ a781e0f8
......@@ -847,7 +847,7 @@ $(document).ready(function() {
};
var editData = answers[$(this).data("form")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......@@ -962,7 +962,7 @@ function commentAnswer(answerId, pos){
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/custom/ctenat/dossierEditCTENat.php
View file @ a781e0f8
......@@ -1117,7 +1117,7 @@ $(document).ready(function() {
}*/
};
//console.log("validation save",formData);
dataHelper.path2Value( formData, function(params) {
prioModal.modal('hide');
......@@ -1236,7 +1236,7 @@ $(document).ready(function() {
};
var editData = answers[$(this).data("form")];
console.log("editForm",editForm,updateForm,editData);
dyFObj.editStep( editForm , editData);
}
});
......@@ -1443,7 +1443,7 @@ function notify () {
answerAfterSave ();
if(notifyType == "planFinancement" && dyFObj.path2Value && notEmpty(dyFObj.path2Value.params.value.financer)) {
console.log(">>>>>> planFinancement", dyFObj.path2Value );
//check financer is part of community and role Financer
//launch action linking project to orga with role Financeur + orga to project
......
views/custom/ctenat/home.php
View file @ a781e0f8
......@@ -371,7 +371,7 @@ foreach ($sessions as $s => $sv) {
label: "Annuler",
className: "btn btn-default pull-left",
callback: function() {
console.log("just do something on close");
}
}
],
......
views/custom/ctenat/resultsRow.php
View file @ a781e0f8
......@@ -108,7 +108,7 @@ var rTmp = null;
$(document).ready(function() {
mylog.log("render","/modules/survey/views/custom/ctenat/resultsRow.php");
$('.editContent').off().click(function() {
//console.log("ping ping");
rTmp = {
pos : $(this).data('pos'),
type : $(this).data('type'),
......
Supports Markdown
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