| Index: trunk/extensions/EducationProgram/includes/EPStudentPager.php |
| — | — | @@ -34,6 +34,9 @@ |
| 35 | 35 | return array( |
| 36 | 36 | 'id', |
| 37 | 37 | 'user_id', |
| | 38 | + 'first_enroll', |
| | 39 | + 'last_active', |
| | 40 | + 'active_enroll', |
| 38 | 41 | ); |
| 39 | 42 | } |
| 40 | 43 | |
| — | — | @@ -68,12 +71,15 @@ |
| 69 | 72 | |
| 70 | 73 | $value = Linker::userLink( $value, $name ) . Linker::userToolLinks( $value, $name ); |
| 71 | 74 | break; |
| | 75 | + case 'first_enroll': case 'last_active': |
| | 76 | + htmlspecialchars( $this->getLanguage()->date( $value ) ); |
| | 77 | + break; |
| | 78 | + case 'active_enroll': |
| | 79 | + $value = wfMsgHtml( $value === '1' ? 'epstudentpager-yes' : 'epstudentpager-no' ); |
| | 80 | + break; |
| 72 | 81 | case '_courses_current': |
| 73 | | - $value = 'foo'; // TODO |
| | 82 | + $value = $this->getLanguage()->pipeList( $this->currentObject->getCurrentCourses() ); |
| 74 | 83 | break; |
| 75 | | - case '_courses_passed': |
| 76 | | - $value = 'bar'; // TODO |
| 77 | | - break; |
| 78 | 84 | } |
| 79 | 85 | |
| 80 | 86 | return $value; |
| — | — | @@ -86,6 +92,9 @@ |
| 87 | 93 | protected function getSortableFields() { |
| 88 | 94 | return array( |
| 89 | 95 | 'id', |
| | 96 | + 'first_enroll', |
| | 97 | + 'last_active', |
| | 98 | + 'active_enroll', |
| 90 | 99 | ); |
| 91 | 100 | } |
| 92 | 101 | |
| — | — | @@ -113,7 +122,6 @@ |
| 114 | 123 | $fields = parent::getFieldNames(); |
| 115 | 124 | |
| 116 | 125 | $fields['_courses_current'] = 'current-courses'; |
| 117 | | - $fields['_courses_passed'] = 'passed-courses'; |
| 118 | 126 | |
| 119 | 127 | return $fields; |
| 120 | 128 | } |
| Index: trunk/extensions/EducationProgram/includes/EPTermPager.php |
| — | — | @@ -74,9 +74,10 @@ |
| 75 | 75 | ); |
| 76 | 76 | break; |
| 77 | 77 | case 'year': |
| | 78 | + $value = htmlspecialchars( $value ); |
| 78 | 79 | break; |
| 79 | 80 | case 'start': case 'end': |
| 80 | | - $value = $this->getLanguage()->date( $value ); |
| | 81 | + $value = htmlspecialchars( $this->getLanguage()->date( $value ) ); |
| 81 | 82 | break; |
| 82 | 83 | case '_status': |
| 83 | 84 | $value = htmlspecialchars( EPTerm::getStatusMessage( $this->currentObject->getStatus() ) ); |
| Index: trunk/extensions/EducationProgram/EducationProgram.i18n.php |
| — | — | @@ -170,6 +170,11 @@ |
| 171 | 171 | 'epstudentpager-header-id' => 'Id', |
| 172 | 172 | 'epstudentpager-header-current-courses' => 'Current courses', |
| 173 | 173 | 'epstudentpager-header-passed-courses' => 'Passed courses', |
| | 174 | + 'epstudentpager-header-first-enroll' => 'First enrollment', |
| | 175 | + 'epstudentpager-header-last-active' => 'Last active', |
| | 176 | + 'epstudentpager-header-active-enroll' => 'Currently enrolled', |
| | 177 | + 'epstudentpager-yes' => 'Yes', |
| | 178 | + 'epstudentpager-no' => 'No', |
| 174 | 179 | |
| 175 | 180 | // Special:EditInstitution |
| 176 | 181 | 'editinstitution-text' => 'Enter the institution details below and click submit to save your changes.', |