Changeset c7e1c5e3b876b15210136b2c3d39db6e89e3a45d in indico

Timestamp:

01/10/12 10:40:08 (4 months ago)

Author:

Alberto Resco Perez <alberto.resco.perez@…>

Children:

f61a08673e29f7b61c695892e844ebc2b7d2780f

Parents:

1ada2d8a45a4196e87b28b56815b71c92ca37379

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (01/10/12 10:40:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (01/18/12 15:28:00)

Message:

[FIX] Fix review status

• Take into account the reallocation.
• Refactoring of the review lists.

File:

• indico/MaKaC/review.py (modified) (10 diffs)

indico/MaKaC/review.py

@@ -1384 +1384 @@
                     abs._addTrackJudgementToHistorical(newta)
 
-        for trj in self._trackRejections.values() :
+        for trj in self.getTrackRejections().values() :
             for newtrack in conference.getTrackList():
                 if newtrack.getTitle() == trj.getTrack().getTitle() :
@@ -1391 +1391 @@
                     abs._addTrackJudgementToHistorical(newtrj)
 
-        for trl in self._trackReallocations.values() :
+        for trl in self.getTrackReallocations().values() :
             for newtrack in conference.getTrackList():
                 if newtrack.getTitle() == trl.getTrack().getTitle() :
@@ -2033 +2033 @@
         """
         """
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-
-        if self._trackAcceptances.has_key( track.getId() ):
-            del self._trackAcceptances[ track.getId() ]
+        if self.getTrackAcceptances().has_key( track.getId() ):
+            del self.getTrackAcceptances()[ track.getId() ]
 
     def _addTrackAcceptance( self, judgement ):
         """
         """
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-
         self._removeTrackRejection( judgement.getTrack() )
         self._removeTrackReallocation( judgement.getTrack() )
-        self._trackAcceptances[ judgement.getTrack().getId() ] = judgement
+        self.getTrackAcceptances()[ judgement.getTrack().getId() ] = judgement
         self._addTrackJudgementToHistorical(judgement)
 
@@ -2059 +2047 @@
         """
         """
-        try:
-            if self._trackRejections:
-                pass
-        except AttributeError, e:
-            self._trackRejections = OOBTree()
-
-        if self._trackRejections.has_key( track.getId() ):
-            del self._trackRejections[ track.getId() ]
+        if self.getTrackRejections().has_key( track.getId() ):
+            del self.getTrackRejections()[ track.getId() ]
 
     def _addTrackRejection( self, judgement ):
         """
         """
-        try:
-            if self._trackRejections:
-                pass
-        except AttributeError, e:
-            self._trackRejections = OOBTree()
-
         self._removeTrackAcceptance( judgement.getTrack() )
         self._removeTrackReallocation( judgement.getTrack() )
-        self._trackRejections[ judgement.getTrack().getId() ] = judgement
+        self.getTrackRejections()[ judgement.getTrack().getId() ] = judgement
         self._addTrackJudgementToHistorical(judgement)
 
@@ -2085 +2061 @@
         """
         """
-        try:
-            if self._trackReallocations:
-                pass
-        except AttributeError, e:
-            self._trackReallocations = OOBTree()
-
-        if self._trackReallocations.has_key( track.getId() ):
-            del self._trackReallocations[ track.getId() ]
+        if self.getTrackReallocations().has_key( track.getId() ):
+            del self.getTrackReallocations()[ track.getId() ]
 
     def _addTrackReallocation( self, judgement ):
         """
         """
-        try:
-            if self._trackReallocations:
-                pass
-        except AttributeError, e:
-            self._trackReallocations = OOBTree()
-
         self._removeTrackAcceptance( judgement.getTrack() )
         self._removeTrackRejection( judgement.getTrack() )
-        self._trackReallocations[ judgement.getTrack().getId() ] = judgement
+        self.getTrackReallocations()[ judgement.getTrack().getId() ] = judgement
         self._addTrackJudgementToHistorical(judgement)
 
     def _clearTrackRejections( self ):
-        try:
-            if self._trackRejections:
-                pass
-        except AttributeError, e:
-            self._trackRejections = OOBTree()
-        while len(self._trackRejections.values())>0:
-            t = self._trackRejections.values()[0].getTrack()
+        while len(self.getTrackRejections().values())>0:
+            t = self.getTrackRejections().values()[0].getTrack()
             self._removeTrackRejection( t )
 
     def _clearTrackAcceptances( self ):
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-        while len(self._trackAcceptances.values())>0:
-            t = self._trackAcceptances.values()[0].getTrack()
+        while len(self.getTrackAcceptances().values())>0:
+            t = self.getTrackAcceptances().values()[0].getTrack()
             self._removeTrackAcceptance( t )
 
     def _clearTrackReallocations( self ):
-        try:
-            if self._trackReallocations:
-                pass
-        except AttributeError, e:
-            self._trackReallocations = OOBTree()
-        while len(self._trackReallocations.values())>0:
-            t = self._trackReallocations.values()[0].getTrack()
+        while len(self.getTrackReallocations().values())>0:
+            t = self.getTrackReallocations().values()[0].getTrack()
             self._removeTrackReallocation(t)
 
@@ -2233 +2182 @@
         """
         """
+        if self.getTrackAcceptances().has_key( track.getId() ):
+            return self.getTrackAcceptances()[ track.getId() ]
+        elif self.getTrackRejections().has_key( track.getId() ):
+            return self.getTrackRejections()[ track.getId() ]
+        elif self.getTrackReallocations().has_key( track.getId() ):
+            return self.getTrackReallocations()[ track.getId() ]
+        return None
+
+    def getTrackAcceptances( self ):
         try:
             if self._trackAcceptances:
@@ -2238 +2196 @@
         except AttributeError, e:
             self._trackAcceptances = OOBTree()
+        return self._trackAcceptances
+
+    def getTrackAcceptanceList( self ):
+        res = []
+        for trackId in intersection( self._tracks, self.getTrackAcceptances() ):
+            res.append( self.getTrackAcceptances()[ trackId ] )
+        return res
+
+    def getNumProposedToAccept( self ):
+        return len( intersection( self._tracks, self.getTrackAcceptances() ) )
+
+    def getTrackRejections( self ):
         try:
             if self._trackRejections:
@@ -2243 +2213 @@
         except AttributeError, e:
             self._trackRejections = OOBTree()
+        return self._trackRejections
+
+    def getNumProposedToReject( self ):
+        return len( intersection( self._tracks, self.getTrackRejections() ) )
+
+    def getTrackReallocations( self ):
         try:
             if self._trackReallocations:
@@ -2248 +2224 @@
         except AttributeError, e:
             self._trackReallocations = OOBTree()
-
-        if self._trackAcceptances.has_key( track.getId() ):
-            return self._trackAcceptances[ track.getId() ]
-        elif self._trackRejections.has_key( track.getId() ):
-            return self._trackRejections[ track.getId() ]
-        elif self._trackReallocations.has_key( track.getId() ):
-            return self._trackReallocations[ track.getId() ]
-        return None
-
-    def getTrackAcceptanceList( self ):
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-        res = []
-        for trackId in intersection( self._tracks, self._trackAcceptances ):
-            res.append( self._trackAcceptances[ trackId ] )
-        return res
-
-    def getNumProposedToAccept( self ):
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-        return len( intersection( self._tracks, self._trackAcceptances ) )
-
-    def getNumProposedToReject( self ):
-        try:
-            if self._trackRejections:
-                pass
-        except AttributeError, e:
-            self._trackRejections = OOBTree()
-        return len( intersection( self._tracks, self._trackRejections ) )
+        return self._trackReallocations
+
+
+    def getNumProposedToReallocate( self ):
+        return len( intersection( self._tracks, self.getTrackReallocations() ) )
+
 
     def getNumJudgements( self ):
         """
-        """
-        try:
-            if self._trackAcceptances:
-                pass
-        except AttributeError, e:
-            self._trackAcceptances = OOBTree()
-        try:
-            if self._trackRejections:
-                pass
-        except AttributeError, e:
-            self._trackRejections = OOBTree()
-        try:
-            if self._trackReallocations:
-                pass
-        except AttributeError, e:
-            self._trackReallocations = OOBTree()
-        tmp1 = union( self._trackAcceptances, self._trackRejections )
-        judgements = union( tmp1, self._trackReallocations )
+        Returns the number of tracks for which some proposal has been done.
+        For instance, let's suppose:
+           Track 1: 2 propose to accept, 3 propose to reject
+           Track 2: 1 propose to accept
+           Track 3: None
+        The result would be 2 (out of 3)
+        """
+        tmp1 = union( self.getTrackAcceptances(), self.getTrackRejections() )
+        judgements = union( tmp1, self.getTrackReallocations() )
         return len( intersection( self._tracks, judgements ) )
 
     def getReallocationTargetedList( self, track ):
-        try:
-            if self._trackReallocations:
-                pass
-        except AttributeError, e:
-            self._trackReallocations = OOBTree()
         #XXX: not optimal
         res = []
-        for r in self._trackReallocations.values():
+        for r in self.getTrackReallocations().values():
             if track in r.getProposedTrackList():
                 res.append( r )
@@ -2780 +2713 @@
         """
         """
-        numAccepts = self._abstract.getNumProposedToAccept()
-        numJudgements = self._abstract.getNumJudgements()
+        numAccepts = self._abstract.getNumProposedToAccept() # number of tracks that have at least one proposal to accept
+        numReallocate = self._abstract.getNumProposedToReallocate() # number of tracks that have at least one proposal to reallocate
+        numJudgements = self._abstract.getNumJudgements() # number of tracks that have at least one judgement
         if numJudgements>0:
-            numTracks = self._abstract.getNumTracks()
-            if numTracks == numJudgements:
-                if numAccepts == 1:
+            numTracks = self._abstract.getNumTracks() # number of tracks that this abstract has assigned
+            if numTracks == numJudgements: # Do we have judgements for all tracks?
+                if numReallocate == numTracks:
+                    s = AbstractStatusInConflict
+                elif numAccepts == 1:
                     s = AbstractStatusProposedToAccept
                 elif numAccepts == 0: