Sfoglia il codice sorgente

اختصاص سرگروه جدید
لیست سرگروه ها

اختصاص مصحح جدید
لیست مصححین

آخرین دوره گذرانده کاربر در دسته کلاس
متناظر

hgh 2 anni fa
parent
commit
c1b061d304

+ 2 - 1
src/api/models/ClassroomLeaders.js

@@ -6,7 +6,8 @@ export default class ClassroomLeaderAPI extends APIRepository {
     super('classroom_leaders', appApi, '/lma/classroom_leaders')
     this.APIAdresses = {
       base: '/lma/classroom_leaders',
-      byId: (id) => '/lma/classroom_leaders/' + id
+      byId: (id) => '/lma/classroom_leaders/' + id,
+      withLastPassedUnit: '/lma/classroom_leaders/leaders_with_last_passed_unit'
     }
     this.CacheList = {
       base: this.name + this.APIAdresses.base,

+ 3 - 1
src/api/models/User.js

@@ -12,7 +12,9 @@ export default class UserAPI extends APIRepository {
       verify: '/uma/users/verify',
       current: '/uma/users/current',
       byId: (id) => '/uma/users/' + id,
-      changeRole: (id) => '/uma/users/' + id + '/change_role'
+      changeRole: (id) => '/uma/users/' + id + '/change_role',
+      unassignedGradersWithLastPassedUnit: '/uma/users/unassigned_graders_with_last_passed_unit',
+      unassignedLeadersWithLastPassedUnit: '/uma/users/unassigned_leaders_with_last_passed_unit'
     }
     this.CacheList = {
       base: this.name + this.APIAdresses.base,

+ 8 - 1
src/components/Widgets/Classroom/AdminClassroomShow/components/GraderList.vue

@@ -92,7 +92,7 @@ export default {
             buttonBadgeColor: 'pink'
           },
 
-          apiAddress: APIGateway.user.APIAdresses.base,
+          apiAddress: APIGateway.user.APIAdresses.unassignedGradersWithLastPassedUnit,
           tableTitle: 'لیست کل مصححین',
           showTableItemsRouteName: 'Admin.BlockManagement.Show',
           tableKeys: {
@@ -118,6 +118,13 @@ export default {
                 align: 'left',
                 field: row => row.firstname + ' ' + row.lastname
               },
+              {
+                name: 'last_passed_unit_title',
+                required: true,
+                label: 'آخرین دوره',
+                align: 'left',
+                field: row => row.last_passed_unit_title
+              },
               {
                 name: 'national_code',
                 required: true,

+ 16 - 2
src/components/Widgets/Classroom/AdminClassroomShow/components/LeaderList.vue

@@ -92,7 +92,7 @@ export default {
             buttonBadgeColor: 'pink'
           },
 
-          apiAddress: APIGateway.user.APIAdresses.base,
+          apiAddress: APIGateway.user.APIAdresses.unassignedLeadersWithLastPassedUnit,
           tableTitle: 'لیست کل سرگروه ها',
           showTableItemsRouteName: 'Admin.BlockManagement.Show',
           tableKeys: {
@@ -118,6 +118,13 @@ export default {
                 align: 'left',
                 field: row => row.firstname + ' ' + row.lastname
               },
+              {
+                name: 'last_passed_unit_title',
+                required: true,
+                label: 'آخرین دوره',
+                align: 'left',
+                field: row => row.last_passed_unit_title
+              },
               {
                 name: 'national_code',
                 required: true,
@@ -159,7 +166,7 @@ export default {
       leaderListInputs: [
         { type: 'hidden', name: 'classroom', value: classroomId }
       ],
-      leaderListApi: APIGateway.classroomLeaders.APIAdresses.base,
+      leaderListApi: APIGateway.classroomLeaders.APIAdresses.withLastPassedUnit,
       leaderListTable: {
         columns: [
           {
@@ -176,6 +183,13 @@ export default {
             align: 'left',
             field: row => row.leader_info.id
           },
+          {
+            name: 'last_passed_unit_title',
+            required: true,
+            label: 'آخرین دوره',
+            align: 'left',
+            field: row => row.last_passed_unit_title
+          },
           {
             name: 'title',
             required: true,