Merge branch 'release/1.5.4'

Bumped version
Merge pull request #236 from Cadiducho/groupNameFix
2018-02-25 13:31:52 +01:00 · 2018-02-25 13:30:45 +01:00 · 2018-02-25 13:19:47 +01:00 · 2018-02-20 13:11:49 +01:00
3 changed files with 17 additions and 3 deletions
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java
@ -198,16 +198,16 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
        if (multiple == 0 && role != Constants.TEACHER_TYPE_CODE) { //single inscriptions:
            holder.checkBox.setVisibility(View.GONE);
            holder.radioButton.setVisibility(View.VISIBLE);
+            holder.radioButton.setText(groupName);

        } else { //multiple inscriptions :

            holder.checkBox.setVisibility(View.VISIBLE);
            holder.radioButton.setVisibility(View.GONE);
+            holder.checkBox.setText(groupName);
+            holder.checkBox.setChecked(member != 0);
        }

-        holder.radioButton.setText(groupName);
-        holder.checkBox.setChecked(member != 0);
-
        holder.nStudentText.setText(context.getString(R.string.numStudent) + ": " + String.valueOf(students));

        if (maxStudents != -1) {
--- a/SWADroid/src/main/res/raw-es/changes.html
+++ b/SWADroid/src/main/res/raw-es/changes.html
@ -14,6 +14,13 @@
    </style>
 </head>

+<body bgcolor="white">
+<h4>1.5.4 (2018-02-25)</h4>
+<ul>
+    <lh class="fix">[CORRECCIONES]</lh>
+    <li type="disc"><strong>Grupos&#58;</strong> Corregida visualización del nombre de los grupos de selección única</li>
+</ul>
+
 <body bgcolor="white">
 <h4>1.5.3 (2017-10-25)</h4>
 <ul>
--- a/SWADroid/src/main/res/raw/changes.html
+++ b/SWADroid/src/main/res/raw/changes.html
@ -14,6 +14,13 @@
    </style>
 </head>

+<body bgcolor="white">
+<h4>1.5.4 (2018-02-25)</h4>
+<ul>
+    <lh class="fix">[FIXES]</lh>
+    <li type="disc"><strong>Groups&#58;</strong> Fixed display of the name of single choice groups</li>
+</ul>
+
 <body bgcolor="white">
 <h4>1.5.3 (2017-10-25)</h4>
 <ul>
Author	SHA1	Message	Date
Juan Miguel Boyero Corral	69f2c34531	Merge branch 'release/1.5.4'	2018-02-25 13:31:52 +01:00
Juan Miguel Boyero Corral	b1b84cd26d	Bumped version	2018-02-25 13:30:45 +01:00
Juan Miguel Boyero Corral	7ededb89c2	Merge pull request #236 from Cadiducho/groupNameFix Fix #235	2018-02-25 13:19:47 +01:00
Dani Matilla	7412ef3485	Fix behaviour with multiple choices	2018-02-20 13:11:49 +01:00