Skip to content

Commit

Permalink
Merge pull request #1578 from sistemasases/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
melissamillares authored Jun 21, 2019
2 parents 7a5dd7b + 1c59762 commit bc4c511
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions managers/ases_report/asesreport_lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,10 @@ function subconsultaGraficReport($ases_status, $icetex_status, $program_status,
function getGraficSex($cohorte, $ases_status, $icetex_status, $program_status, $instance_id){
global $DB;
$sql_query = "SELECT COUNT(usuario.id) AS cantidad,
CASE WHEN usuario_ases.sexo = 'M' THEN 'Masculino'
WHEN usuario_ases.sexo = 'F' THEN 'Femenino'
ELSE 'N.R'
CASE WHEN usuario_ases.sexo = '1' THEN 'Masculino'
WHEN usuario_ases.sexo = '2' THEN 'Femenino'
WHEN usuario_ases.sexo = '3' THEN 'Intersexual'
ELSE 'N.R'
END AS nombre
FROM {talentospilos_user_extended} AS usuario
INNER JOIN {talentospilos_usuario} AS usuario_ases
Expand Down
4 changes: 2 additions & 2 deletions templates/view_socioed_tab_sp.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
{{#add_peer_tracking_sp}}

{{#add_peer_tracking_lts}}
<button type="button" id="button_add_track" class="btn-primary">
<!--<button type="button" id="button_add_track" class="btn-primary">
Nuevo seguimiento (2017)
</button>
</button>-->
{{/add_peer_tracking_lts}}
<button type="button" id="button_add_v2_track" class="btn-primary">
Nuevo seguimiento
Expand Down

0 comments on commit bc4c511

Please sign in to comment.