/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to codeigniter/application/models/examplesmodel.php

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-14 12:42:58 UTC
  • mfrom: (64.1.1 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130514124258-0apqr7uvjukqesef
Mered lots of changes to many files.
Hopefully this will work :-)

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/models/examplesmodel.php
4
4
                /* Loads category names for menu */
5
5
                function getTitles($user)
6
6
                {
7
 
                        $this -> db -> select('Categories.categoryName, Categories.CourseID');
 
7
                        $this -> db -> select('Categories.categoryName, Categories.courseID');
8
8
                        $this -> db -> from('Categories');
9
9
                        $this -> db -> join('StudentCourseRegistrations', 'Categories.courseID = StudentCourseRegistrations.courseID'); 
10
10
                        $this -> db -> where('StudentCourseRegistrations.username', $user); 
 
11
                        $this -> db -> order_by("orderNr", "asc"); 
11
12
                /*      $this -> db -> where('StudentCourseRegistrations.courseID', 'd1popcrn');  
12
13
                *       Line is disabled for now because of testing purposes.
13
14
                *       Will be modified to be used with parameter in function.