Con ultimo migration

app/controllers/CriteriaController.php

@@ -205,13 +205,13 @@ class CriteriaController extends \BaseController
 
         $clean_input['copyright'] = trim(preg_replace('/\t+/', '', Input::get('copyright')));
         $clean_input['notes'] = trim(preg_replace('/\t+/', '', Input::get('notes')));
-        // $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
+        $clean_input['maximum_score'] =  (int) Input::get('maximum_score');
         // $clean_input['scale_title'] = Input::get('title');
-        //$clean_input['scale_description'] = Input::get('Scales');
+        $clean_input['scale_description'] = Input::get('Scales');
         // $clean_input['min_score'] = Input::get('min');
         //$clean_input['max_score'] = Input::get('max');
 
-        // $clean_input['number_of_scales'] = sizeof($clean_input['scale_title']);
+        $clean_input['number_of_scales'] = sizeof($clean_input['scale_description']);
 
 
         return $clean_input;
@@ -226,8 +226,8 @@ class CriteriaController extends \BaseController
                 'subcriteria' => $clean_input['subcriteria'],
                 'outcome_id' => $clean_input['outcome_id'],
                 'notes' => $clean_input['notes'],
-                'copyright' => $clean_input['copyright']
-                //'maximum_score' => $clean_input['maximum_score']
+                'copyright' => $clean_input['copyright'],
+                'maximum_score' => $clean_input['maximum_score']
             ),
             array(
                 'name' => 'required|string',
@@ -235,8 +235,8 @@ class CriteriaController extends \BaseController
                 'outcome_id' => 'required|array',
 
                 'notes' => 'string',
-                'copyright' => 'string'
-                //'maximum_score' => 'required|integer'
+                'copyright' => 'string',
+                'maximum_score' => 'required|integer'
             )
 
         );
@@ -318,16 +318,15 @@ class CriteriaController extends \BaseController
                     }
                 }
 
-                /*for ($i = 0; $i < sizeof($clean_input['scale_title']); $i++) {
+                for ($i = 0; $i < sizeof($clean_input['scale_description']); $i++) {
                     $scale = new Scale;
-                    $scale->title = $clean_input['scale_title'][$i];
-                    $scale->position = $i + 1;
+
+                    $position = $i;
                     $scale->description = $clean_input['scale_description'][$i];
-                    $scale->min_score = $clean_input['min_score'][$i];
-                    $scale->max_score = $clean_input['max_score'][$i];
+
 
                     if ($scale->save()) {
-                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`) values({$criterionId},{$scale->id})");
+                        DB::insert("insert into `criterion_scale` (`criterion_id`, `scale_id`, `position`) values({$criterionId},{$scale->id}, {$position})");
                     } else {
                         Session::flash('status', 'danger');
                         Session::flash('message', '<p>Error creating the Scales</p>');
@@ -343,7 +342,7 @@ class CriteriaController extends \BaseController
                                 return Redirect::to('program-criteria')->withInput();
                         }
                     }
-                }*/
+                }
 
                 foreach ($clean_input['program_id'] as $program_id) {
                     DB::insert("insert into `program_criterion` (`criterion_id`, `program_id`) values({$criterionId},{$program_id})");

app/database/migrations/2021_07_06_075249_fix_activities.php

@@ -30,6 +30,14 @@ class FixActivities extends Migration
 	 */
 	public function down()
 	{
-		//
+		Schema::table('activities', function (Blueprint $table) {
+			$table->text('criteria_achieved')->nullable();
+			$table->text('criteria_weights')->nullable();
+			$table->text('outcomes_achieved')->nullable();
+			$table->text('outcomes_attempted')->nullable();
+			$table->text('criteria_achieved_percentage')->nullable();
+			$table->text('criteria_participant_count')->nullable();
+			$table->text('criteria_achiever_count')->nullable();
+		});
 	}
 }

app/database/migrations/2021_07_06_075356_criterion_scale.php

@@ -27,6 +27,7 @@ class CriterionScale extends Migration
 				->on('scales')
 				->onUpdate('cascade')
 				->onDelete('cascade');
+			$table->integer('position')->unsigned();
 		});
 	}
 

app/database/migrations/2021_07_06_130407_create_transformative_objective_activity.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTransformativeObjectiveActivity extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('transformative_objective_activity', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('trans_action_id')->unsigned();
+			$table->integer('activity_id')->unsigned();
+			$table->integer('objective_id')->unsigned();
+			$table->foreign('objective_id')
+				->references('id')
+				->on('objectives')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('trans_action_id')
+				->references('id')
+				->on('transformative_actions')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('activity_id')
+				->references('id')
+				->on('activities')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('transformative_objective_activity');
+	}
+}

app/views/local/managers/admins/new_criteria.blade.php

@@ -18,7 +18,7 @@
                     <div class="form-group col-md-11">
                         <label>Associated Outcomes</label>
 
-                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect('outcomeGroup', 'objectiveGroup')']) }}
+                        {{ Form::select('outcome[]', $outcomes, reset($outcomes),  ['class'=>'form-control selectpicker', 'id' =>'outcome0', 'onchange'=>'fetchObjectiveForSelect("outcomeGroup", "objectiveGroup")']) }}
 
                     </div>
                 </div>

app/views/local/managers/pCoords/criteria.blade.php

@@ -67,7 +67,19 @@
                     <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
                     {{ Form::textarea('subcriteria', '', array('class' => 'form-control', 'rows'=>3, 'aria-labelledby'=>'subcriteria')) }}
                 </div>
-                
+                <div class="form-group">
+                    {{ Form::label('maximum_score', 'Maximum Score') }}
+                    {{ Form::text('maximum_score', '1', array('class' => 'form-control', 'id'=>'maximum_score', 'oninput'=>'addOptions("Num_scale", "maximum_score", "Scales")')) }}
+                </div>
+                <div class="form-group">
+                    {{ Form::label('scales', 'Number of Scales') }}
+                    <select id="Num_scale" name="scales" class="form-control selectpicker" onchange='numberOfScales("Num_scale", "Scales")'>
+
+                    </select>
+                </div>
+                <div id='Scales' data-value="0">
+
+                </div>
 
 
                 <div class="form-group">
@@ -200,6 +212,21 @@
                     <p class="help-block"><strong>Manually add</strong> bullets or numbering.</p>
                     {{ Form::textarea('subcriteria', '', array('class' => 'form-control', 'rows'=>3, 'id' => 'criterion_subcriteria')) }}
                 </div>
+                <div class="form-group">
+                    {{ Form::label('assoc_maximum_score', 'Maximum Score') }}
+                    {{ Form::text('assoc_maximum_score', '', array('class' => 'form-control', 'id'=>'assoc_maximum_score', 'oninput'=>'addOptions("Num_assoc_scale", "assoc_maximum_score", "Assoc_Scales")')) }}
+                </div>
+
+
+                <div class="form-group">
+                    {{ Form::label('scales', 'Number of Scales') }}
+                    <select id="Num_assoc_scale" class="form-control selectpicker" onchange='numberOfAssoc("Num_assoc_scale", "Assoc_Scales")'>
+
+                    </select>
+                </div>
+                <div id='Assoc_Scales' data-value="0">
+
+                </div>
 
 
 
@@ -232,9 +259,109 @@
     var counter = 1;
     var counterObj = 1;
     var outcomeString = 'OutcomeGroup_';
+
+    $(document).ready(function() {
+        addOptions('Num_scale', 'maximum_score', 'Scales');
+        numberOfScales('Num_scale', 'Scales');
+    });
+
+    function addOptions(select, max, scaleDiv) {
+
+        
+        var maxscore = parseInt($('#' + max).val())
+        options = '<option value = "1"> 1</option>';
+        selectedValue = 1;
+    valueBefore = 0;
+        for (var i = 2; i <= 20; i++) {
+            if(maxscore%i==0){
+                options += '<option value="' + i.toString() + '">' + i.toString() + '</option>';
+                
+            }
+            
+        }
+
+        var previousvalue = parseInt($('#' + select).val());
+        $('#' + select).html(options);
+        $('#' + select).val(previousvalue);
+        $('#' + select).selectpicker('refresh');
+    }
+
+    function numberOfAssoc(string, Scales) {
+        var maximum = $('#assoc_maximum_score').val();
+        var amountOfScale = parseInt($('#' + string).val());
+        var dataValue = parseInt($('#' + Scales).attr('data-value'));
+        //add
+        if (dataValue < amountOfScale) {
+
+            fullDiv = '';
+
+            for (var i = dataValue; i < amountOfScale; i++) {
+                div = '<div id="assoc_eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label for ="descripcion' + i.toString() + '">Descripción de evaluación</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="descripcion' + i.toString() + '" name="assoc_scales[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+
+
+            }
+
+            $('#' + Scales).append(fullDiv);
+            $('#' + Scales).attr('data-value', amountOfScale);
+        } else {
+            for (var i = dataValue; i > amountOfScale; i--) {
+                $('#assoc_eval' + (i - 1).toString()).remove();
+            }
+        }
+        $('#' + Scales).attr('data-value', amountOfScale);
+
+    }
    
+    function numberOfScales(string, Scales) {
+        var maximum = parseInt($('#maximum_score').val());
+        var amountOfScale = parseInt($('#' + string).val());
+        var dataValue = parseInt($('#' + Scales).attr('data-value'));
+        var division = maximum/amountOfScale;
+        //add
+    
+
 
 
+            fullDiv = '';
+            if(division ==1){
+                for (var i = 0; i < amountOfScale; i++) {
+                div = '<div id="eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label id = "label_for_des'+i.toString()+'" for ="descripcion' + i.toString() + '">Scale Description ('+(i+1)+')</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="descripcion' + i.toString() + '" name="' + Scales + '[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+            }
+            }
+            else if(division==maximum){
+
+                div = '<div id="eval' + 0 + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label id = "label_for_des'+0+'" for ="descripcion' + 0 + '">Scale Description ('+1+' - '+maximum+')</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="descripcion' + 0 + '" name="' + Scales + '[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+            }
+
+            else{
+                for (var i = 0; i < amountOfScale; i++) {
+                div = '<div id="eval' + i.toString() + Scales + '">' +
+                    '<div class ="form-group">' +
+                    '<label id = "label_for_des'+i.toString()+'" for ="descripcion' + i.toString() + '">Scale Description ('+(1+(i*division))+' - '+((1+i)*division)+')</label>' +
+                    '<textarea class="form-control" rows="2" aria-labelledby="descripcion' + i.toString() + '" name="' + Scales + '[]" cols="50" ></textarea></div></div>';
+                fullDiv += div;
+            }
+            }
+
+            $('#' + Scales).html(fullDiv);
+
+        
+        $('#' + Scales).attr('data-value', amountOfScale);
+
+    }
+
 $('.filterSection').hide();
     $('.filterButton').on('click', function()
 {

app/views/local/managers/shared/rubrics.blade.php

@@ -1015,14 +1015,14 @@ function changeTable(){
             counter = 0;
             division = maximum/amount_of_scales;
             if(amount_of_scales==1){
-                newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
+                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Score (1 - "+maximum+")</th>";
             }
             else if(maximum!= amount_of_scales){
             while(counter <amount_of_scales){
                 
                 minimumScore = 1+(counter*division);
                 maximumScore = (1+counter)*division;
-                newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
+                newScaleHeaders+= "<th class = 'editable' data-type = 'textarea'>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
                 counter++;
             }
             }else{