Edit de backup

app/config/app.php

@@ -125,7 +125,7 @@ return array(
 		'Illuminate\Workbench\WorkbenchServiceProvider',
 		'Way\Generators\GeneratorsServiceProvider',
 		'Barryvdh\DomPDF\ServiceProvider',
-		'Cornford\Backup\Providers\BackupServiceProvider',
+		//'Cornford\Backup\Providers\BackupServiceProvider',
 		'Zizaco\Entrust\EntrustServiceProvider'
 
 	),
@@ -159,7 +159,7 @@ return array(
 		'App'               => 'Illuminate\Support\Facades\App',
 		'Artisan'           => 'Illuminate\Support\Facades\Artisan',
 		'Auth'              => 'Illuminate\Support\Facades\Auth',
-		'Backup'	        => 'Cornford\Backup\Facades\Backup',
+		//'Backup'	        => 'Cornford\Backup\Facades\Backup',
 		'Blade'             => 'Illuminate\Support\Facades\Blade',
 		'Cache'             => 'Illuminate\Support\Facades\Cache',
 		'ClassLoader'       => 'Illuminate\Support\ClassLoader',

app/controllers/CriteriaController.php

@@ -550,6 +550,23 @@ class CriteriaController extends \BaseController
             }
         }
     }
+
+    public function index()
+    {
+        // el ID de los semestres que el usuario tiene seleccionado.
+        $semesters_ids = Session::get('semesters_ids');
+        // buscar informacion de los semestres seleccionados
+        $semesters = Semester::whereIn('id', $semesters_ids)->get();
+
+        $title = "Learning Outcomes and Criteria";
+        $outcomes = Outcome::orderBy('name', 'ASC')->get();
+        $schools = School::orderBy('name', 'ASC')->get();
+        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
+
+        // se annadio la nueva variable
+        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
+    }
+
     // copie index() y lo edite
     public function objectivesIndex()
     {
@@ -585,63 +602,6 @@ class CriteriaController extends \BaseController
 
         return View::make('global.view-objectives-criteria', compact('title', 'objectives'));
     }
-    public function index()
-    {
-        // el ID de los semestres que el usuario tiene seleccionado.
-        $semesters_ids = Session::get('semesters_ids');
-        // buscar informacion de los semestres seleccionados
-        $semesters = Semester::whereIn('id',$semesters_ids)->get();
-
-        $title = "Learning Outcomes and Criteria";
-        $outcomes = Outcome::orderBy('name', 'ASC')->get();
-        $schools = School::orderBy('name', 'ASC')->get();
-        $criteria = Criterion::withTrashed()->orderBy('name', 'ASC')->get();
-
-        // se annadio la nueva variable
-        return View::make('global.view-learning-outcomes-criteria', compact('title', 'outcomes', 'schools', 'criteria', 'semesters'));
-
-    }
-
-    // copie index() y lo edite
-    public function objectivesIndex()
-    {
-        if(Auth::user()->role==1)
-        {
-          //uscar todos los objetivos
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
-        }
-        elseif(Auth::user()->role==2)
-        {
-          //buscar los objetivos de la departamento (school)
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->where('programs.school_id',Auth::user()->school_id)
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
-        }
-        elseif((Auth::user()->role==3) || (Auth::user()->role==4))
-        {
-          //buscar los objetivos de los programas cuales el profesor esta
-          $objectives = DB::table('program_user')
-                                ->join('objectives','objectives.program_id','=','program_user.program_id')
-                                ->join('programs','programs.id','=','program_user.program_id')
-                                ->where('program_user.user_id',Auth::user()->id)
-                                ->select('objectives.id','objectives.text','programs.name')
-                                ->orderBy('objectives.text', 'asc')
-                                ->get();
-        }
-
-        $title = "Learning Objectives and Criteria";
-
-        return View::make('global.view-objectives-criteria', compact('title', 'objectives'));
-    }
 
     public function destroy()
     {

composer.json

@@ -1,21 +1,23 @@
 {
 	"name": "laravel/laravel",
 	"description": "The Laravel Framework.",
-	"keywords": ["framework", "laravel"],
+	"keywords": [
+		"framework",
+		"laravel"
+	],
 	"license": "MIT",
 	"type": "project",
 	"require": {
 		"laravel/framework": "4.2.*",
 		"pda/pheanstalk": "~2.0",
 		"barryvdh/laravel-dompdf": "0.4.*",
-		 "zizaco/entrust": "1.2.*@dev",
-		"cornford/backup": "1.*"
-},
+		"zizaco/entrust": "1.2.*@dev"
+	},
 	"require-dev": {
 		"way/generators": "~2.0",
 		"fzaninotto/faker": "1.5.*@dev",
 		"barryvdh/laravel-ide-helper": "1.11"
-		},
+	},
 	"autoload": {
 		"classmap": [
 			"app/commands",
@@ -43,4 +45,4 @@
 		"preferred-install": "dist"
 	},
 	"minimum-stability": "stable"
-}
+}