oreolek/kangana
1
0
Fork 0
mirror of https://github.com/Oreolek/kangana.git synced 2024-05-04 10:08:17 +03:00
Code Issues Releases Wiki Activity

Test updates

Browse source
This commit is contained in:
Alexander Yakovlev 2016-11-13 23:15:39 +07:00
parent 31a285c55c
commit 4353228c86
2 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
application/classes/Model/Course.php
View file

@ -118,16 +118,17 @@ class Model_Course extends ORM {
->distinct(TRUE)
->from('clients_courses')
->execute()
->as_array(NULL, 'course_id');
->get('course_id');
}
else
{
$groups = Model_Group::get_ids();
return DB::select('id')
$ids = DB::select('id')
->from('courses')
->where('group_id', 'IN', $groups)
->execute()
->as_array(NULL, 'id');
->get('id');
return $ids;
}
}

41
application/tests/test_data/courses.xml
View file

@ -8,32 +8,36 @@
<value>Test Group</value>
</row>
</table>
<table name="courses">
<column>id</column>
<column>title</column>
<column>description</column>
<column>period</column>
<column>price</column>
<column>group_id</column>
<row>
<value>1</value>
<value>Test course</value>
<value>Application testing purposes</value>
<value>1</value>
<value>0</value>
<value>1</value>
</row>
</table>
<table name="clients">
<column>id</column>
<column>email</column>
<column>name</column>
<column>token</column>
<column>referrer</column>
<column>sex</column>
<row>
<value>1</value>
<value>test@example.com</value>
<value>Test User</value>
<value></value><!-- empty token -->
<value></value><!-- empty referrer -->
<value>f</value>
</row>
</table>
<table name="courses">
<column>id</column>
<column>group_id</column>
<column>title</column>
<column>description</column>
<column>period</column>
<column>price</column>
<row>
<value>1</value>
<value>1</value>
<value>Test course</value>
<value>Application testing purposes</value>
<value>1</value>
<value>0</value>
</row>
</table>
<table name="clients_courses">
@ -50,6 +54,11 @@
<column>id</column>
<column>client_id</column>
<column>group_id</column>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
</row>
</table>
<table name="letters">
<column>id</column>