{% if app.user and is_granted('ROLE_MASTER') %}
- Ajouter un Scrum
+ Ajouter un Scrum
{% endif %}
@@ -47,7 +46,7 @@
-
-
-
+
{{ scrum.name }}
- {% for milestone in tbstat %}
-
@@ -134,15 +141,6 @@
});
}
- if($("#filterteams").val().length!==0) {
- data = $("#filterteams").select2('data');
- textfilters=textfilters+" EQUIPES =";
- $.each($("#filterteams").val(), function( index, value ) {
- if(index>0)textfilters=textfilters+" &";
- textfilters=textfilters+" "+data[index].text;
- });
- }
-
$("#textfilters").html(textfilters);
}
@@ -173,48 +171,20 @@
});
$('#filtermilestones').on("select2:unselect", function(e) {
filtermilestones();
- });
+ });
- // Filter Teams
- function filterteams() {
- $.ajax({
- method: "POST",
- url: "{{ path('app_user_preference') }}",
- data: {
- key:'filterteams',
- id:{{scrum.id}},
- value: $("#filterteams").val()
- }
- });
-
- location.reload();
- }
- $('#filterteams').select2();
- {% if filterteams %}
- {% for team in filterteams %}
- $("#filterteams").val($("#filterteams").val().concat("{{team}}"));
- {%endfor%}
- $('#filterteams').trigger('change');
- {% endif %}
- $('#filterteams').on("select2:select", function(e) {
- filterteams();
- });
- $('#filterteams').on("select2:unselect", function(e) {
- filterteams();
- });
-
- {% for milestone in tbstat %}
+ {% for jalon in tbestim %}
var data = [
- {% for data in milestone.stat %}
+ {% for column in jalon.columns %}
{
- label: "{{ data.label}}",
- data: {{ data.total }},
- color: "{{ data.color }}",
+ label: "{{ column.nmcol}}",
+ data: {{ column.nbjrs }},
+ color: "#{{ column.color }}",
},
{% endfor %}
];
- var plotObj = $.plot($("#floatdonut{{ milestone.id }}"), data, {
+ var plotObj = $.plot($("#floatdonut{{ jalon.idjal }}"), data, {
series: {
pie: {
show: true,
@@ -238,39 +208,42 @@
},
});
- {% for data in milestone.stat %}
- {% for data in milestone.stat %}
- var data = [
- {% for label in data.labels %}
- {
- label: "{{ label.label}}",
- data: {{ label.total }},
- color: "{{ label.color }}",
- },
- {% endfor %}
- ];
- var plotObj = $.plot($("#floatsubdonut{{ milestone.id }}-{{ data.id }}"), data, {
- series: {
- pie: {
- show: true,
- label: {
- show: false,
- radius: 3/4,
- threshold: 0.1,
- background: {
- opacity: 0.5,
- color: '#cdcdcd',
- },
- }
- }
- },
- legend: {
- show: false,
- },
- });
+ {% for sprint in jalon.sprints %}
+ var data = [
+ {% for column in sprint.columns %}
+ {
+ label: "{{ column.nmcol}}",
+ data: {{ column.nbjrs }},
+ color: "#{{ column.color }}",
+ },
{% endfor %}
+ ];
+
+ var plotObj = $.plot($("#floatdonut{{ jalon.idjal~"-"~sprint.idspr }}"), data, {
+ series: {
+ pie: {
+ show: true,
+ radius: 1,
+ label: {
+ show: true,
+ radius: 1,
+ threshold: 0.1,
+ background: {
+ opacity: 0.5,
+ color: '#cdcdcd',
+ },
+ formatter: function(label, series) {
+ return '' + label + '';
+ }
+ }
+ }
+ },
+ legend: {
+ show: false,
+ },
+ });
{% endfor %}
- {% endfor %}
+ {% endfor %}
{% if not showfilters %}
$("#filters").addClass("d-none");
diff --git a/templates/Issue/list.html.twig b/templates/Scrum/table.html.twig
similarity index 89%
rename from templates/Issue/list.html.twig
rename to templates/Scrum/table.html.twig
index 6b9d81f..2547fba 100644
--- a/templates/Issue/list.html.twig
+++ b/templates/Scrum/table.html.twig
@@ -37,26 +37,6 @@
-
{{milestone.name}}
-
-
-
-
-
+
+ {% endif %}
+ {% endfor %}
- {% for column in milestone.stat %}
-
- {% endfor %}
+
-
- {{ column.label }} = {{ column.total }}
-
-
- {% for label in column.labels %}
- {{label.label}} = {{label.total}}
- {% endfor %}
-
-
+
+ {% for jalon in tbestim %}
+ {% if jalon.nbjrs>0 %}
+
+
- {{jalon.nmjal}}
+
+
-
+
+
+
- {%endfor%}
+
+ {% for column in jalon.columns %}
+
{{column.nmcol}}{{column.nbjrs}}
+ {% endfor %}
+ TOTAL{{jalon.nbjrs}}
+
+ {% for sprint in jalon.sprints %}
+ {% if jalon.nbjrs != sprint.nbjrs and sprint.nbjrs>0 %}
+
+
+
+
+ {% endif %}
+ {% endfor %}
+ {{sprint.nmspr}}
+
+
+
+
+ {% for column in sprint.columns %}
+
+ {{column.nmcol}}{{column.nbjrs}}
+ {% endfor %}
+ TOTAL{{sprint.nbjrs}}
+
-
-
-
-
-
-
-
-
- {% endif %}
-
+
+
+
+
+
+
+
+
-
{{ column.name }}
+ {% for column in tbissues %}
+
+
{{ column.nmcol }}
- {% for issue in column.scrumissues %}
- {% set tosee=false %}
- {% if app.session.get('viewclosed')=="true" and issue.giteastate=="closed" %}
- {% set tosee=true %}
- {% endif %}
- {% if issue.giteastate!="closed" %}
- {% set tosee=true %}
- {% endif %}
+ {% for jalon in column.jalons %}
+ {% for sprint in jalon.sprints %}
+
+ + {% if app.session.flashbag.has('error') %} +
+
{% endfor %}
@@ -316,9 +308,6 @@
{% endblock %}
{% block localjavascript %}
-
-
-
function showFilters() {
if($("#filters").hasClass("d-flex")) {
toshow=0;
@@ -345,7 +334,9 @@
$(document).ready(function() {
// Apply Filter
function showhide() {
- if($("#filtermilestones").val().length !== 0) {
+
+ // Afficher masquer les jalons
+ if($("#filtermilestones").val().length !== 0 && $("#filtersprints").val().length === 0) {
$("[data-milestone]").hide();
$.each($("#filtermilestones").val(), function( index, value ) {
$("[data-milestone="+value+"]").show();
@@ -353,6 +344,15 @@
}
else $("[data-milestone]").show();
+ // Afficher masquer les sprints
+ if($("#filtersprints").val().length !== 0) {
+ $("[data-millestonesprint]").hide();
+ $.each($("#filtersprints").val(), function( index, value ) {
+ $("[data-millestonesprint="+value+"]").show();
+ });
+ }
+ else if($("#filtermilestones").val().length === 0)$("[data-millestonesprint]").show();
+
$(".issue").show();
$( ".issue" ).each(function( index ) {
@@ -419,6 +419,15 @@
});
}
+ if($("#filtersprints").val().length!==0) {
+ data = $("#filtersprints").select2('data');
+ textfilters=textfilters+" SPRINT =";
+ $.each($("#filtersprints").val(), function( index, value ) {
+ if(index>0)textfilters=textfilters+" &";
+ textfilters=textfilters+" "+data[index].text;
+ });
+ }
+
if($("#filterteams").val().length!==0) {
data = $("#filterteams").select2('data');
textfilters=textfilters+" EQUIPES =";
@@ -557,6 +566,35 @@
filtermilestones();
});
+ // Filter Sprint
+ function filtersprints() {
+ $.ajax({
+ method: "POST",
+ url: "{{ path('app_user_preference') }}",
+ data: {
+ key:'filtersprints',
+ id:{{scrum.id}},
+ value: $("#filtersprints").val()
+ }
+ });
+
+ showhide();
+ }
+
+ $('#filtersprints').select2({sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)),});
+ {% if filtersprints %}
+ {% for sprint in filtersprints %}
+ $("#filtersprints").val($("#filtersprints").val().concat("{{sprint}}"));
+ {%endfor%}
+ $('#filtersprints').trigger('change');
+ {% endif %}
+ $('#filtersprints').on("select2:select", function(e) {
+ filtersprints();
+ });
+ $('#filtersprints').on("select2:unselect", function(e) {
+ filtersprints();
+ });
+
// Filter Teams
function filterteams() {
$.ajax({
@@ -750,12 +788,13 @@
id=$(ui.item).data("issue");
oldcolumn=$(ui.item).data("column");
oldmilestone=$(ui.item).data("milestone");
+ oldsprint=$(ui.item).data("sprint");
newcolumn=$(ui.item).parent().data("column");
newmilestone=$(ui.item).parent().data("milestone");
- console.log("ID = "+id+" = Column : "+oldcolumn+">>"+newcolumn+" = Milestone : "+oldmilestone+">>"+newmilestone );
-
- if(oldcolumn!=newcolumn||oldmilestone!=newmilestone) {
+ newsprint=$(ui.item).parent().data("sprint");
+ console.log("ID = "+id+" = Column : "+oldcolumn+">>"+newcolumn+" = Milestone : "+oldmilestone+">>"+newmilestone+" = Sprint : "+oldsprint+">>"+newsprint );
+ if(oldcolumn!=newcolumn||oldmilestone!=newmilestone||oldsprint!=newsprint) {
$.ajax({
method: "POST",
url: "{{path("app_scrumissue_change")}}",
@@ -763,12 +802,15 @@
id:id,
oldcolumn:oldcolumn,
oldmilestone:oldmilestone,
+ oldsprint:oldsprint,
newcolumn:newcolumn,
newmilestone:newmilestone,
+ newsprint:newsprint
},
success: function(data) {
$(ui.item).data("column",newcolumn);
$(ui.item).data("milestone",newmilestone);
+ $(ui.item).data("sprint",newsprint);
if(data) lastupdate=data;
refreshinfo();
@@ -814,7 +856,7 @@
}
}
});
- }, 60000);
+ }, 6000);
});
{% endblock %}
\ No newline at end of file
diff --git a/templates/Scrumsprint/close.html.twig b/templates/Scrumsprint/close.html.twig
new file mode 100755
index 0000000..f025bd9
--- /dev/null
+++ b/templates/Scrumsprint/close.html.twig
@@ -0,0 +1,11 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+
+{% endblock %}
+
+{% block localjavascript %}
+ $(document).ready(function() {
+ window.parent.$("#mymodalsprint").modal('hide');
+ });
+{% endblock %}
diff --git a/templates/Scrumsprint/edit.html.twig b/templates/Scrumsprint/edit.html.twig
new file mode 100755
index 0000000..cd374de
--- /dev/null
+++ b/templates/Scrumsprint/edit.html.twig
@@ -0,0 +1,51 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+{{ form_start(form) }}
+ {{ form_widget(form.submit) }}
+
+
+ {% if mode=="update" %}
+
+ Supprimer
+
+ {% endif %}
+
+
+ JALON = {{jalon.nmjal}}
+ SPRINT = {{sprint.nmspr}} +
- {% if tosee %}
- {% set haveissues=true %}
- {% if idmiletone!=issue.giteamilestone %}
- {% if idmiletone!=-100 %}{% endif %}
-
- {% if issue.giteamilestone is empty %}
- {% set tbidmiletone = tbidmiletone|merge([-100]) %}
- {% set idmilestone = -100 %}
- {% set namemilestone = "Aucun" %}
- {% else %}
- {% set tbidmiletone = tbidmiletone|merge([issue.giteamilestone]) %}
- {% set idmilestone = issue.giteamilestone %}
- {% set namemilestone = issue.giteajson.milestone.title %}
- {% endif %}
-
- + SPRINT = {{sprint.nmspr}} +
JALON = {{namemilestone}}
--
- {% set idmiletone=issue.giteamilestone %}
- {% endif %}
-
- {% set datalabels="" %}
- {% set datateams="" %}
- {% set datatypes="" %}
- {% set dataprioritys="datapriority"~giteaprioritys|last %}
- {% for label in issue.giteajson.labels %}
- {% if label.id not in giteacolumns and label.id in giteateams %}
- {% set datateams=datateams~"datateam"~label.id~" " %}
- {% endif %}
-
- {% if label.id not in giteacolumns and label.id in giteatypes %}
- {% set datatypes=datatypes~"datatype"~label.id~" " %}
- {% endif %}
-
- {% if label.id not in giteacolumns and label.id in giteaprioritys %}
- {% set dataprioritys="datapriority"~label.id~" " %}
- {% endif %}
-
- {% if label.id not in giteacolumns and label.id not in giteateams and label.id not in giteatypes and label.id not in giteaprioritys %}
- {% set datalabels=datalabels~"datalabel"~label.id~" " %}
- {% endif %}
- {% endfor %}
-
- {% set dataassignees="" %}
- {% for assignee in issue.giteajson.assignees %}
- {% set dataassignees=dataassignees~"dataassignee"~assignee.id~" " %}
- {% endfor %}
-
-
-
-
-
-
- {% endif %}
+ {% endfor %}
{% endfor %}
-
- {% if haveissues %}
-
- {% endif %}
-
- {% for giteamilestone in giteamilestones %}
- {% if giteamilestone.id not in tbidmiletone %}
-
-
- {{issue.giteanumber}} - {{ issue.giteatitle }}
- Crée le {{issue.giteajson.created_at|date("d/m/y")}}Modifié le {{issue.giteajson.updated_at|date("d/m/y")}} - {% if issue.giteastate=="closed" %} -
Clos le {{issue.giteajson.closed_at|date("d/m/y")}} +
- Crée le {{issue.giteajson.created_at|date("d/m/y")}}Modifié le {{issue.giteajson.updated_at|date("d/m/y")}} - {% if issue.giteastate=="closed" %} -
Clos le {{issue.giteajson.closed_at|date("d/m/y")}} +
+
+ {% if label.id not in giteacolumns and label.id in giteaprioritys %}
+ {% set dataprioritys="datapriority"~label.id~" " %}
+ {% endif %}
+
+ {% if label.id not in giteacolumns and label.id not in giteateams and label.id not in giteatypes and label.id not in giteaprioritys %}
+ {% set datalabels=datalabels~"datalabel"~label.id~" " %}
+ {% endif %}
+ {% endfor %}
+
+ {% set dataassignees="" %}
+ {% for assignee in issue.giteajson.assignees %}
+ {% set dataassignees=dataassignees~"dataassignee"~assignee.id~" " %}
+ {% endfor %}
+
+ -
+ {% for issue in sprint.issues %}
+ {% set tosee=false %}
+ {% if app.session.get('viewclosed')=="true" and issue.giteastate=="closed" %}
+ {% set tosee=true %}
+ {% endif %}
+ {% if issue.giteastate!="closed" %}
+ {% set tosee=true %}
{% endif %}
-
- - - {% for label in issue.giteajson.labels %} - {% if label.id not in giteacolumns and label.id in giteaprioritys %} - - - {{ label.name }} - - {% endif %} - {% endfor %} -
- {% for label in issue.giteajson.labels %} - {% if label.id not in giteacolumns and label.id in giteatypes %} - - - {{ label.name }} - - {% endif %} - {% endfor %} -
- {% for label in issue.giteajson.labels %} - {% if label.id not in giteacolumns and label.id in giteateams %} - - - {{ label.name }} - - {% endif %} - {% endfor %} -
- {% for label in issue.giteajson.labels %} - {% if label.id not in giteacolumns and label.id not in giteateams and label.id not in giteaprioritys and label.id not in giteatypes %} - - - {{ label.name }} - - {% endif %} - {% endfor %} + {% if tosee %} + {% set datalabels="" %} + {% set datateams="" %} + {% set datatypes="" %} + {% set dataprioritys="datapriority"~giteaprioritys|last %} + {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteateams %} + {% set datateams=datateams~"datateam"~label.id~" " %} + {% endif %} -
- {% for assignee in issue.giteajson.assignees %}
- 
- {% endfor %}
-
+ {% if label.id not in giteacolumns and label.id in giteatypes %}
+ {% set datatypes=datatypes~"datatype"~label.id~" " %}
+ {% endif %}
-
- = {{ issue.weight }}
-
-
-
+
+
+
+ {% endif %}
+ {% endfor %}
+
+
+
+
+ {{issue.giteanumber}} - {{ issue.giteatitle }}
+ Crée le {{issue.giteajson.created_at|date("d/m/y")}}Modifié le {{issue.giteajson.updated_at|date("d/m/y")}} + {% if issue.giteastate=="closed" %} +
Clos le {{issue.giteajson.closed_at|date("d/m/y")}} + {% endif %} +
+ + + + {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteaprioritys %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteatypes %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteateams %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id not in giteateams and label.id not in giteaprioritys and label.id not in giteatypes %} + + + {{ label.name }} + + {% endif %} + {% endfor %} + +
+ + Crée le {{issue.giteajson.created_at|date("d/m/y")}}Modifié le {{issue.giteajson.updated_at|date("d/m/y")}} + {% if issue.giteastate=="closed" %} +
Clos le {{issue.giteajson.closed_at|date("d/m/y")}} + {% endif %} +
+ + + + {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteaprioritys %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteatypes %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id in giteateams %} + + + {{ label.name }} + + {% endif %} + {% endfor %} +
+ {% for label in issue.giteajson.labels %} + {% if label.id not in giteacolumns and label.id not in giteateams and label.id not in giteaprioritys and label.id not in giteatypes %} + + + {{ label.name }} + + {% endif %} + {% endfor %} + +
+ {% for assignee in issue.giteajson.assignees %}
+
+ {% endfor %}
+
+
+
+ = {{ issue.weight }}
+
+
+ JALON = {{giteamilestone.title}}
-JALON = Aucun
-+ + {% if app.session.flashbag.has('error') %} +
+ Erreur
+ {% for flashMessage in app.session.flashbag.get('error') %} + {{ flashMessage }}
+ {% endfor %} +
+ {% endif %}
+
+ {% if app.session.flashbag.has('notice') %}
+ + {% for flashMessage in app.session.flashbag.get('error') %} + {{ flashMessage }}
+ {% endfor %} +
+ Information
+ {% for flashMessage in app.session.flashbag.get('notice') %} + {{ flashMessage }}
+ {% endfor %} +
+ {% endif %}
+
+ {{ form_row(form.name) }}
+ {{ form_row(form.giteamilestone) }}
+{{ form_end(form) }}
+
+{% endblock %}
+
+{% block localjavascript %}
+ $(document).ready(function() {
+ $("#scrumsprint_name").focus();
+ });
+
+ function closeModal() {
+ window.parent.$("#mymodaltype").modal('hide');
+ }
+{% endblock %}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index afd5cb9..4178bae 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -66,8 +66,6 @@
+ {% for flashMessage in app.session.flashbag.get('notice') %} + {{ flashMessage }}
+ {% endfor %} +