taskjuggler 0.1.1 → 0.2.0

data/lib/taskjuggler/ShiftAssignments.rb

@@ -34,7 +34,7 @@ class TaskJuggler
 
     # Return a deep copy of self.
     def copy
-      ShiftAssignment.new(@shiftScenario, Interval.new(@interval))
+      ShiftAssignment.new(@shiftScenario, TimeInterval.new(@interval))
     end
 
     # Return true if the _iv_ interval overlaps with the assignment interval.
@@ -143,13 +143,12 @@ class TaskJuggler
     end
 
     # This function returns the entry in the scoreboard that corresponds to
-    # _date_. If the slot has not yet been determined, it's calculated first.
-    def getSbSlot(date)
-      idx = @scoreboard.dateToIdx(date)
+    # _idx_. If the slot has not yet been determined, it's calculated first.
+    def getSbSlot(idx)
       # Check if we have a value already for this slot.
       return @scoreboard[idx] unless @scoreboard[idx].nil?
 
-
+      date = @scoreboard.idxToDate(idx)
       # If not, compute it.
       @assignments.each do |sa|
         next unless sa.assigned?(date)
@@ -175,27 +174,30 @@ class TaskJuggler
     end
 
     # Returns true if any of the defined shift periods overlaps with the date or
-    # interval specified by _date_.
-    def assigned?(date)
-      (getSbSlot(date) & 1) == 1
+    # interval specified by _idx_.
+    def assigned?(idx)
+      (getSbSlot(idx) & 1) == 1
     end
 
-    # Returns true if any of the defined shift periods contains the
-    # _date_ and the shift has working hours defined for that _date_.
-    def onShift?(date)
-      (getSbSlot(date) & (1 << 1)) == 0
+    # Returns true if any of the defined shift periods contains the date
+    # specified by the scoreboard index _idx_ and the shift has working hours
+    # defined for that date.
+    def onShift?(idx)
+      (getSbSlot(idx) & (1 << 1)) == 0
     end
 
-    # Returns true if any of the defined shift periods contains the _date_ and
-    # the shift has a vacation defined or all off hours defined for that _date_.
-    def timeOff?(date)
-      (getSbSlot(date) & 0x3E) != 0
+    # Returns true if any of the defined shift periods contains the date
+    # specified by the scoreboard index _idx_ and the shift has a vacation
+    # defined or all off hours defined for that date.
+    def timeOff?(idx)
+      (getSbSlot(idx) & 0x3E) != 0
     end
 
-    # Returns true if any of the defined shift periods contains the _date_ and
-    # if the shift has a vacation defined for the _date_.
-    def onVacation?(date)
-      (getSbSlot(date) & 0x3C) != 0
+    # Returns true if any of the defined shift periods contains the date
+    # specified by the scoreboard index _idx_ and if the shift has a vacation
+    # defined for the date.
+    def onVacation?(idx)
+      (getSbSlot(idx) & 0x3C) != 0
     end
 
     # Return a list of intervals that lay within _iv_ and are at least

data/lib/taskjuggler/Task.rb

@@ -24,7 +24,7 @@ class TaskJuggler
 
       @data = Array.new(@project.scenarioCount, nil)
       @project.scenarioCount.times do |i|
-        @data[i] = TaskScenario.new(self, i, @scenarioAttributes[i])
+        TaskScenario.new(self, i, @scenarioAttributes[i])
       end
     end
 

data/lib/taskjuggler/TaskJuggler.rb

@@ -206,63 +206,77 @@ class TaskJuggler
   end
 
   # Generate an export report definition for bookings up to the _freezeDate_.
-  def freeze(freezeDate)
-    # Check the master file is really a file and not stdin.
-    unless (masterFile = @project.inputFiles.masterFile)
-      error('cannot_freeze_stdin',
-            "The project freeze feature only when the master file is a " +
-            "real file, not standard input.")
-    end
+  def freeze(freezeDate, taskBookings)
+    begin
+      # Check the master file is really a file and not stdin.
+      unless (masterFile = @project.inputFiles.masterFile)
+        @messageHandler.error('cannot_freeze_stdin',
+                              "The project freeze feature only when the " +
+                              "master file is a real file, not standard input.")
+      end
 
-    # Derive the file names for the header and bookings file from the base
-    # name of the master file.
-    masterFileBase = File.basename(masterFile, '.tjp')
-    headerFile = masterFileBase + '-header.tji'
-    bookingsFileBase = masterFileBase + '-bookings'
-    bookingsFile = bookingsFileBase + '.tji'
-
-    if !File.exists?(bookingsFile) || !File.exists?(headerFile)
-      @messageHandler.info('incl_freeze_files',
-                           "Please make sure you include #{headerFile} at " +
-                           "the end of the project header and " +
-                           "#{bookingsFile} at the end of #{masterFile}.")
-    end
+      # Derive the file names for the header and bookings file from the base
+      # name of the master file.
+      masterFileBase = File.basename(masterFile, '.tjp')
+      headerFile = masterFileBase + '-header.tji'
+      bookingsFileBase = masterFileBase + '-bookings'
+      bookingsFile = bookingsFileBase + '.tji'
+
+      if !File.exists?(bookingsFile) || !File.exists?(headerFile)
+        @messageHandler.info('incl_freeze_files',
+                             "Please make sure you include #{headerFile} at " +
+                             "the end of the project header and " +
+                             "#{bookingsFile} at the end of #{masterFile}.")
+      end
 
-    # Generate the project header include file with the new 'now' date.
-    begin
-      File.open(headerFile, 'w') do |f|
-        f.puts("now #{freezeDate}")
+      # Generate the project header include file with the new 'now' date.
+      begin
+        File.open(headerFile, 'w') do |f|
+          f.puts("now #{freezeDate}")
+        end
+      rescue
+        @messageHandler.error('write_header_incl',
+                              "Cannote write header include file " +
+                              "#{headerFile}")
       end
-    rescue
-      @messageHandler.critical('write_header_incl',
-                               "Cannote write header include file " +
-                               "#{headerFile}")
-    end
 
-    # Generate an export report for the bookings.
-    report = Report.new(@project, '_bookings_', bookingsFileBase, nil)
-    report.typeSpec = :export
-    report.set('formats', [ :tjp ])
-    report.inheritAttributes
+      # Generate an export report for the bookings.
+      report = Report.new(@project, '_bookings_', bookingsFileBase, nil)
+      report.typeSpec = :export
+      report.set('formats', [ :tjp ])
+      report.inheritAttributes
 
-    # We export only the tracking scenario.
-    unless (trackingScenarioIdx = @project['trackingScenarioIdx'])
-      @messageHandler.critical('no_tracking_scen',
-                               'No trackingscenario defined')
+      # We export only the tracking scenario.
+      unless (trackingScenarioIdx = @project['trackingScenarioIdx'])
+        @messageHandler.error('no_tracking_scen',
+                              'No trackingscenario defined')
+      end
+      report.set('scenarios', [ trackingScenarioIdx ])
+
+      # Only generate bookings up to the freeze date.
+      report.set('end', freezeDate)
+      # Show all tasks, sorted by seqno-up.
+      report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
+      # Show all resources, sorted by seqno-up.
+      report.set('hideResource',
+                  LogicalExpression.new(LogicalOperation.new(0)))
+      report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+      # Only generate bookings, no other attributes or definitions.
+      report.set('definitions', [])
+      # We group the bookings by task or by resource depending on the user
+      # request.
+      if taskBookings
+        report.set('taskAttributes', [ 'booking' ])
+        report.set('resourceAttributes', [])
+      else
+        report.set('taskAttributes', [])
+        report.set('resourceAttributes', [ 'booking' ])
+      end
+    rescue TjException
+      return false
     end
-    report.set('scenarios', [ trackingScenarioIdx ])
-
-    # Show all tasks, sorted by seqno-up.
-    report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-    report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-    # Show all resources, sorted by seqno-up.
-    report.set('hideResource',
-                LogicalExpression.new(LogicalOperation.new(0)))
-    report.set('sortResources', [ [ 'seqno', true, -1 ] ])
-    # Only generate bookings, no other attributes or definitions.
-    report.set('definitions', [])
-    report.set('taskAttributes', [ 'booking' ])
-    report.set('resourceAttributes', [])
+    true
   end
 
   # Check the content of the file _fileName_ and interpret it as a time sheet.