Changeset 3cd3b7 in indico

Timestamp:

01/25/10 16:12:56 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

c10907

Parents:

dbc739

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (01/25/10 15:42:41)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (01/25/10 16:12:56)

Message:

[FIXED] Small issues - Cesar's fixes

• Unnecessary variable storage;
• Some trailing spaces
• jslinting

Location:

indico

Files:

• MaKaC/services/implementation/schedule.py (modified) (1 diff)
• htdocs/js/indico/Legacy/Dialogs.js (modified) (1 diff)
• htdocs/js/indico/Management/Timetable.js (modified) (8 diffs)
• htdocs/js/indico/Timetable/Base.js (modified) (1 diff)

indico/MaKaC/services/implementation/schedule.py

@@ -442 +442 @@
         sessionServices.SessionSlotModifCoordinationBase._checkParams(self)
         ScheduleEditBreakBase._checkParams(self)
+        self._brk = self._schEntry
+
+    def _addToSchedule(self, b):
+        # if the schedule target day is different from the current
         if self._schEntry.getStartDate().date() != self._dateTime.date():
-            self._dayChanged = True
-        else:
-            self._dayChanged = False
-        self._brk = self._schEntry
-
-    def _addToSchedule(self, b):
-        if self._dayChanged:
             owner = self._schEntry.getOwner()
 
+            # remove the entry
             self._schEntry.getSchedule().removeEntry(self._schEntry)
 
+            # set it to the new date
             self._schEntry.setStartDate(self._dateTime)
+            # add it on the new date
             self._conf.getSchedule().addEntry(self._schEntry, check=2)
 

indico/htdocs/js/indico/Legacy/Dialogs.js

@@ -291 +291 @@
                                    endDate.setHours(startDate.getHours()+1);
                                }
-                               
+
                                dateArgs.startDate = startDate;
                                dateArgs.endDate = endDate;

indico/htdocs/js/indico/Management/Timetable.js

@@ -300 +300 @@
             //to make the request for the session timetable or the top level timetable
             if(exists(self.timetable.parentTimetable)){
-                if(self.previousDate.substr(0,10) != self.dateArgs.selectedDay)
-                    self.timeStartMethod = self.timetable.managementActions.methods['Event'].getDayEndDate;
-                else
-                    self.timeStartMethod = self.timetable.managementActions.methods['SessionSlot'].getDayEndDate;
+                if(self.previousDate.substr(0,10) != self.dateArgs.selectedDay) {
+                    self.timeStartMethod = self.timetable.managementActions.methods.Event.getDayEndDate;
+                } else {
+                    self.timeStartMethod = self.timetable.managementActions.methods.SessionSlot.getDayEndDate;
+                }
             }
 
@@ -366 +367 @@
                 [$T('Place'), Html.div({style: {marginBottom: '15px'}}, this.roomEditor.draw())],
                 [$T('Date'), conferenceDays],
-                [$T('Start time'), Html.div({class: 'popUpLabel', style:{textAlign: 'left'}}, this.startTimeField,
+                [$T('Start time'), Html.div({className: 'popUpLabel', style:{textAlign: 'left'}}, this.startTimeField,
                             $T(' Duration '), this.timeField, $T('min'))],
                 [$T('Presenter(s)'), presListWidget.draw()]
@@ -500 +501 @@
             //if we are inside a session and the new contribution is set for a different day, we suppose that the contribution is not part of the session
             if(self.dayChanged){
-                self.method = self.timetable.managementActions.methods['Contribution'].add;
+                self.method = self.timetable.managementActions.methods.Contribution.add;
             }
             submitInfo();
@@ -711 +712 @@
                      //in case we're inside a session and the break is added to a different day, we suppose it's not inside the session anymore
                      if(self.dayChanged){
-                         self.method = self.managementActions.methods['Break'].add;
+                         self.method = self.managementActions.methods.Break.add;
                      }
                      else{
-                         if(exists(self.managementActions.timetable.parentTimetable))
-                             self.method = self.managementActions.methods['SessionBreak'].add;
+                         if(exists(self.managementActions.timetable.parentTimetable)) {
+                             self.method = self.managementActions.methods.SessionBreak.add;
+                         }
                      }
                      self._submitInfo();
@@ -744 +746 @@
                     /* if we chose a different day, it doesn't matter
                         if we are inside a session */
-                         self.timeStartMethod = self.managementActions.methods['Event'].dayEndDate;
+                         self.timeStartMethod = self.managementActions.methods.Event.dayEndDate;
                  } else {
-                         if(exists(self.managementActions.timetable.parentTimetable))
+                     if(exists(self.managementActions.timetable.parentTimetable)) {
                              self.timeStartMethod = self.managementActions.methods[self.originalArgs.parentType].dayEndDate;
+                     }
                  }
-                 
+
                  //we make a timeStartMethod request specifying the date for the request
                  //and we get the result of the request as a result
@@ -815 +818 @@
                  [$T('Place'), this.roomEditor.draw()],
                  [$T('Date'), conferenceDays],
-                 [$T('Start time'), Html.div({class: 'popUpLabel', style:{textAlign: 'left'}}, this.startTimeField,
+                 [$T('Start time'), Html.div({className: 'popUpLabel', style:{textAlign: 'left'}}, this.startTimeField,
                              $T(' Duration '), this.timeField, $T('min'))]
                   ]),
@@ -840 +843 @@
                       else {
                           //if we are moving the result to the top timetable we don't need the session slot
-                          if(self.dayChanged && exists(result.slotEntry))
+                          if(self.dayChanged && exists(result.slotEntry)) {
                               result.slotEntry = null;
-                           self.managementActions.timetable._updateMovedEntry(result, args.get('scheduleEntryId'));
-                           self.close();
+                          }
+                          self.managementActions.timetable._updateMovedEntry(result, args.get('scheduleEntryId'));
+                          self.close();
                       }
              });
@@ -899 +903 @@
                                    $T("Add Break"),
                                    function(result) {
-                                         if(exists(managementActions.timetable.parentTimetable) && this.dayChanged)
-                                             managementActions.timetable.parentTimetable._updateEntry(result, result.id);
-                                         else
-                                             managementActions.timetable._updateEntry(result, result.id);
+                                       if(exists(managementActions.timetable.parentTimetable) && this.dayChanged) {
+                                           managementActions.timetable.parentTimetable._updateEntry(result, result.id);
+                                       } else {
+                                           managementActions.timetable._updateEntry(result, result.id);
+                                       }
                                    });
 

indico/htdocs/js/indico/Timetable/Base.js

@@ -268 +268 @@
     },
 
-    getDays: function() {        
+    getDays: function() {
         return this.sortedKeys;
     },