[fixes BUG #3890] Lesson plan for elective subjects not visible. (fixes with changes in employee timetable and teachers timetable backend)

git-svn-id: file:///svn/fedena2.1/branches/fedena2.1_i18n@4121 1b8ff446-76f8-11e0-a33c-ba5893e5f458

Author: foradian

app/controllers/timetable_controller.rb

@@ -201,7 +201,9 @@ def teachers_timetable
           @elective_teachers=sub.elective_group.subjects.collect(&:employees).flatten
           @current.timetable_entries.find_all_by_subject_id(sub.id).each_with_index do |tt , i|
             @elective_teachers.each do |e|
-              @timetable_entries[e.id][tt.weekday_id][tt.class_timing_id][i] = tt
+              unless sub.elective_group.subjects.first == sub && sub.employees.first == e
+                @timetable_entries[e.id][tt.weekday_id][tt.class_timing_id][i] = tt
+              end
             end
           end
         end
@@ -241,7 +243,9 @@ def update_teacher_tt
         @elective_teachers=sub.elective_group.subjects.collect(&:employees).flatten
         @current.timetable_entries.find_all_by_subject_id(sub.id).each_with_index do |tt , i|
           @elective_teachers.each do |e|
-            @timetable_entries[e.id][tt.weekday_id][tt.class_timing_id][i] = tt
+            unless sub.elective_group.subjects.first == sub && sub.employees.first == e
+              @timetable_entries[e.id][tt.weekday_id][tt.class_timing_id][i] = tt
+            end
           end
         end
       end
@@ -315,8 +319,13 @@ def employee_timetable
         @electives=@employee.subjects.group_by(&:elective_group_id)
         @timetable_entries = Hash.new { |l, k| l[k] = Hash.new(&l.default_proc) }
         @employee_subjects = @employee.subjects
+        subjects = @employee_subjects.select{|sub| sub.elective_group_id.nil?}
+        electives = @employee_subjects.select{|sub| sub.elective_group_id.present?}
+        elective_subjects=electives.map{|x| x.elective_group.subjects.first}
         @employee_timetable_subjects = @employee_subjects.map {|sub| sub.elective_group_id.nil? ? sub : sub.elective_group.subjects.first}
-        @entries = @current.timetable_entries.find(:all,:conditions=>{:subject_id=>@employee_timetable_subjects,:employee_id => @employee.id})
+        @entries=[]
+        @entries += @current.timetable_entries.find(:all,:conditions=>{:subject_id=>subjects,:employee_id => @employee.id})
+        @entries += @current.timetable_entries.find(:all,:conditions=>{:subject_id=>elective_subjects})
         @all_timetable_entries = @entries.select{|t| t.batch.is_active}.select{|s| s.class_timing.is_deleted==false}.select{|w| w.weekday.is_deleted==false}
         @all_batches = @all_timetable_entries.collect(&:batch).uniq
         @all_weekdays = @all_timetable_entries.collect(&:weekday).uniq.sort!{|a,b| a.weekday <=> b.weekday}
@@ -352,8 +361,13 @@ def update_employee_tt
     @electives=@employee.subjects.group_by(&:elective_group_id)
     @timetable_entries = Hash.new { |l, k| l[k] = Hash.new(&l.default_proc) }
     @employee_subjects = @employee.subjects
+    subjects = @employee_subjects.select{|sub| sub.elective_group_id.nil?}
+    electives = @employee_subjects.select{|sub| sub.elective_group_id.present?}
+    elective_subjects=electives.map{|x| x.elective_group.subjects.first}
     @employee_timetable_subjects = @employee_subjects.map {|sub| sub.elective_group_id.nil? ? sub : sub.elective_group.subjects.first}
-    @entries = @current.timetable_entries.find(:all,:conditions=>{:subject_id=>@employee_timetable_subjects,:employee_id => @employee.id})
+    @entries=[]
+    @entries += @current.timetable_entries.find(:all,:conditions=>{:subject_id=>subjects,:employee_id => @employee.id})
+    @entries += @current.timetable_entries.find(:all,:conditions=>{:subject_id=>elective_subjects})
     @all_timetable_entries = @entries.select{|t| t.batch.is_active}.select{|s| s.class_timing.is_deleted==false}.select{|w| w.weekday.is_deleted==false}
     @all_batches = @all_timetable_entries.collect(&:batch).uniq
     @all_weekdays = @all_timetable_entries.collect(&:weekday).uniq.sort!{|a,b| a.weekday <=> b.weekday}
@@ -460,7 +474,7 @@ def work_allotment
     end
     @batches = Batch.active.scoped :include=>[{:subjects=>:employees},:course]
     @subjects = @batches.collect(&:subjects).flatten
- end
+  end
   def timetable
     @config = Configuration.available_modules
     @batches = Batch.active

app/models/timetable.rb

@@ -72,8 +72,12 @@ def self.tte_for_the_weekday(batch,day)
   end
 
   def self.employee_tte(employee,date)
-    subjects = employee.subjects.map {|sub| sub.elective_group_id.nil? ? sub : sub.elective_group.subjects.first}
-    entries = TimetableEntry.find(:all,:joins=>[:timetable, :class_timing, :weekday],:conditions=>["(timetables.start_date <= ? AND timetables.end_date >= ?) AND timetable_entries.subject_id in (?) AND timetable_entries.employee_id = (?) AND class_timings.is_deleted = false AND weekdays.is_deleted = false",date,date,subjects,employee.id], :order=>"class_timings.start_time")
+    subjects = employee.subjects.select{|sub| sub.elective_group_id.nil?}
+    electives = employee.subjects.select{|sub| sub.elective_group_id.present?}
+    elective_subjects=electives.map{|x| x.elective_group.subjects.first}
+    entries =[]
+    entries += TimetableEntry.find(:all,:joins=>[:timetable, :class_timing, :weekday],:conditions=>["(timetables.start_date <= ? AND timetables.end_date >= ?) AND timetable_entries.subject_id in (?) AND timetable_entries.employee_id = (?) AND class_timings.is_deleted = false AND weekdays.is_deleted = false",date,date,subjects,employee.id], :order=>"class_timings.start_time")
+    entries += TimetableEntry.find(:all,:joins=>[:timetable, :class_timing, :weekday],:conditions=>["(timetables.start_date <= ? AND timetables.end_date >= ?) AND timetable_entries.subject_id in (?)  AND class_timings.is_deleted = false AND weekdays.is_deleted = false",date,date,elective_subjects], :order=>"class_timings.start_time")
     if entries.empty?
       today=[]
     else