Changeset 717e50 in indico


Ignore:
Timestamp:
03/02/11 14:03:35 (2 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
8aaf1b
Parents:
6e9e95
git-author:
Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (11/11/10 16:23:25)
git-committer:
Jose Benito <jose.benito.gonzalez@…> (03/02/11 14:03:35)
Message:

[FTR] Add questions for abstract reviewing

  • The functionality of adding questions for the abstract reviewing is implemented
Location:
indico/MaKaC
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/conference.py

    r6e9e95 r717e50  
    4949from MaKaC.contributionReviewing import ReviewManager 
    5050from reviewing import ConferencePaperReview as ConferencePaperReview 
     51from reviewing import ConferenceAbstractReview as ConferenceAbstractReview 
    5152 
    5253from pytz import timezone 
    … …  
    21192120        self._keywords = "" 
    21202121        self._confPaperReview = ConferencePaperReview(self) 
     2122        self._confAbstractReview = ConferenceAbstractReview(self) 
    21212123        self._orgText = "" 
    21222124        self._comments = "" 
    … …  
    21722174            self._confPaperReview = ConferencePaperReview(self) 
    21732175        return self._confPaperReview 
     2176 
     2177    def getConfAbstractReview(self): 
     2178        if not hasattr(self, "_confAbstractReview"): 
     2179            self._confAbstractReview = ConferenceAbstractReview(self) 
     2180        return self._confAbstractReview 
    21742181 
    21752182    def getOrgText( self ): 

  • indico/MaKaC/services/implementation/reviewing.py

    r6e9e95 r717e50  
    6464        ConferenceModifBase._checkParams(self) 
    6565        self._confPaperReview = self._conf.getConfPaperReview() 
     66        self._confAbstractReview = self._conf.getConfAbstractReview() 
    6667 
    6768class ConferenceReviewingPRMBase(ConferenceReviewingBase): 
    … …  
    183184        self._confPaperReview.setReviewingQuestions(self._value) 
    184185 
     186class ConferenceAbstractReviewingQuestionsModification(ConferenceReviewingListModificationBase): 
     187 
     188    def _handleGet(self): 
     189        return self._confAbstractReview.getReviewingQuestions() 
     190 
     191    def _handleSet(self): 
     192        self._confAbstractReview.setReviewingQuestions(self._value) 
     193 
     194 
    185195class ConferenceReviewingCriteriaModification(ConferenceReviewingListModificationBase): 
    186196 
    … …  
    230240 
    231241    def _setParam(self): 
    232         self._conf.getConfPaperReview().setDefaultAbstractReviewerDueDate(self._pTime) 
    233  
    234     def _handleGet(self): 
    235         date = self._conf.getConfPaperReview().getAdjustedDefaultAbstractReviewerDueDate() 
     242        self._conf.getConfAbstractReview().setDefaultAbstractReviewerDueDate(self._pTime) 
     243 
     244    def _handleGet(self): 
     245        date = self._conf.getConfAbstractReview().getAdjustedDefaultAbstractReviewerDueDate() 
    236246        if date: 
    237247            return datetime.datetime.strftime(date,'%d/%m/%Y %H:%M') 
    … …  
    577587 
    578588class ConferenceReviewingRemoveAllReviewers(ConferenceReviewingAssignStaffBasePRMReferee): 
    579     """ Removes all the reviewers from a list of contributions 
     589    """ Removes all t<<<<<<< HEAD 
     590======= 
     591        #self._reviewableMaterials = MaterialFactoryRegistry._allowedMaterials['reviewing'] 
     592>>>>>>> [FTR] Add questions for abstract reviewinghe reviewers from a list of contributions 
    580593    """ 
    581594    def _getAnswer(self): 
    … …  
    735748 
    736749        return True 
    737  
    738750##################################### 
    739751###  Contribution reviewing classes 
    … …  
    883895    "conference.changeStates": ConferenceReviewingStatesModification, 
    884896    "conference.changeQuestions": ConferenceReviewingQuestionsModification, 
     897    "conference.changeAbstractQuestions": ConferenceAbstractReviewingQuestionsModification, 
    885898    "conference.changeCriteria": ConferenceReviewingCriteriaModification, 
    886899    "conference.deleteTemplate" : ConferenceReviewingDeleteTemplate, 

  • indico/MaKaC/webinterface/pages/reviewing.py

    r6e9e95 r717e50  
    369369    def getVars(self): 
    370370        vars = wcomponents.WTemplated.getVars( self ) 
    371         vars["ConfReview"] = self._conf.getConfPaperReview() 
     371        vars["abstractReview"] = self._conf.getConfAbstractReview() 
    372372        #vars["reviewingQuestions"] = self._conf.getConferenceReview().getAbstractReviewingQuestions() 
    373373        return vars 

  • indico/MaKaC/webinterface/rh/reviewingModif.py

    r6e9e95 r717e50  
    4040        """ 
    4141        return request._conf.getConfPaperReview().isPaperReviewManager(request.getAW().getUser()) 
    42      
     42 
    4343class RCAbstractManager: 
    4444    @staticmethod 
    … …  
    4646        """ Returns true if the user is an AM of the conference 
    4747        """ 
    48         return request._conf.getConfPaperReview().isAbstractManager(request.getAW().getUser()) 
    49      
     48        return request._conf.getConfAbstractReview().isAbstractManager(request.getAW().getUser()) 
     49 
    5050class RCReviewingStaff: 
    5151    @staticmethod 
    … …  
    5454        """ 
    5555        return request._conf.getConfPaperReview().isInReviewingTeam(request.getAW().getUser()) 
    56      
     56 
    5757class RCReferee: 
    5858    @staticmethod 
    … …  
    6868        """ 
    6969        return request._conf.getConfPaperReview().isEditor(request.getAW().getUser()) 
    70      
     70 
    7171class RCReviewer: 
    7272    @staticmethod 
    … …  
    7575        """ 
    7676        return request._conf.getConfPaperReview().isReviewer(request.getAW().getUser()) 
    77      
     77 
    7878class RHConfModifReviewingAccess(RHConferenceModifKey): 
    7979    """ Class used when the user clicks on the main 'Reviewing' tab 
    … …  
    8484        redirected to the appropiate subtab. 
    8585    """ 
    86      
     86 
    8787    def _checkParams(self, params): 
    8888        RHConferenceModifKey._checkParams(self, params) 
    … …  
    9595 
    9696    def _checkProtection(self): 
    97          
     97 
    9898        if not self._isReviewingStaff: 
    9999            if self._getUser() == None: 
    … …  
    101101            else: 
    102102                RHConferenceModifKey._checkProtection(self) 
    103      
    104     def _process( self ): 
    105                
     103 
     104    def _process( self ): 
     105 
    106106        if self._redirectURL != "": 
    107107            url = self._redirectURL 
    108          
     108 
    109109        elif self._conf.canModify(self.getAW()) or self._isPRM: 
    110110            url = urlHandlers.UHConfModifReviewingPaperSetup.getURL( self._conf ) 
    … …  
    114114            url = urlHandlers.UHConfModifReviewingAssignContributionsList.getURL( self._conf ) 
    115115        elif self._isReviewer: 
    116             url = urlHandlers.UHConfModifListContribToJudgeAsReviewer.getURL( self._conf )             
     116            url = urlHandlers.UHConfModifListContribToJudgeAsReviewer.getURL( self._conf ) 
    117117        elif self._isEditor: 
    118118            url = urlHandlers.UHConfModifListContribToJudgeAsEditor.getURL( self._conf ) 
    119119        elif self._isReviewingStaff: 
    120120            url= urlHandlers.UHConfModifListContribToJudge.getURL( self._conf ) 
    121              
     121 
    122122        else: #we leave this else just in case 
    123123            url = urlHandlers.UHConfModifReviewingPaperSetup.getURL( self._conf ) 
    124              
     124 
    125125        self._redirect( url ) 
    126126 
    … …  
    129129        If user is not a paper review manager, they need to be a conference manager. 
    130130    """ 
    131      
     131 
    132132    def _checkProtection(self): 
    133133        if self._target.hasEnabledSection("paperReviewing"): 
    134134            if not RCPaperReviewManager.hasRights(self): 
    135                 RHConferenceModifBase._checkProtection(self);             
     135                RHConferenceModifBase._checkProtection(self); 
    136136        else: 
    137137            raise MaKaCError(_("Paper Reviewing is not active for this conference")) 
    138          
    139      
    140              
     138 
     139 
     140 
    141141class RHConfModifReviewingAMBase (RHConferenceModifBase): 
    142142    """ Base class that allows only abstract managers to do this request. 
    143143        If user is not a paper review manager, they need to be a conference manager. 
    144144    """ 
    145      
     145 
    146146    def _checkProtection(self): 
    147147        if self._target.hasEnabledSection("paperReviewing"): 
    148148            if not RCAbstractManager.hasRights(self): 
    149                 RHConferenceModifBase._checkProtection(self);             
     149                RHConferenceModifBase._checkProtection(self); 
    150150        else: 
    151151            raise MaKaCError(_("Paper Reviewing is not active for this conference")) 
    152152 
    153153 
    154              
     154 
    155155class RHConfModifReviewingPRMAMBase (RHConferenceModifBase): 
    156156    """ Base class that allows only paper review managers OR abstract managers to do this request. 
    157157        If user is not a paper review manager, they need to be a conference manager. 
    158158    """ 
    159      
     159 
    160160    def _checkProtection(self): 
    161161        if self._target.hasEnabledSection("paperReviewing"): 
    162162            if not RCPaperReviewManager.hasRights(self) and not RCAbstractManager.hasRights(self): 
    163                 RHConferenceModifBase._checkProtection(self);             
     163                RHConferenceModifBase._checkProtection(self); 
    164164        else: 
    165165            raise MaKaCError(_("Paper Reviewing is not active for this conference")) 
    … …  
    179179            p = WPConfModifReviewingPaperSetup( self, self._target) 
    180180        return p.display() 
    181          
     181 
    182182class RHConfModifReviewingAbstractSetup( RHConfModifReviewingAMBase ): 
    183183    """ Class used when the user clicks on the Abstract Setup 
    … …  
    216216        RHConfModifReviewingPRMBase._checkParams( self, params ) 
    217217        self._state = params.get("state") 
    218          
     218 
    219219    def _process( self ): 
    220220        self._conf.getConfPaperReview().addState( self._state ) 
    … …  
    224224class RHRemoveState(RHConfModifReviewingPRMBase): 
    225225    _uh = urlHandlers.UHRemoveState 
    226      
     226 
    227227    def _checkParams(self, params): 
    228228        RHConfModifReviewingPRMBase._checkParams(self, params) 
    229229        self._state = params.get("stateSelection") 
    230      
     230 
    231231    def _process(self): 
    232232        self._conf.getConfPaperReview().removeState(self._state) 
    … …  
    246246class RHRemoveQuestion(RHConfModifReviewingPRMBase): 
    247247    _uh = urlHandlers.UHRemoveQuestion 
    248      
     248 
    249249    def _checkParams(self, params): 
    250250        RHConfModifReviewingPRMBase._checkParams(self, params) 
    251251        self._question = params.get("questionSelection") 
    252      
     252 
    253253    def _process(self): 
    254254        self._conf.getConfPaperReview().removeReviewingQuestion(self._question) 
    … …  
    268268class RHRemoveCriteria(RHConfModifReviewingPRMBase): 
    269269    _uh = urlHandlers.UHRemoveCriteria 
    270      
     270 
    271271    def _checkParams(self, params): 
    272272        RHConfModifReviewingPRMBase._checkParams(self, params) 
    273273        self._criteria = params.get("criteriaSelection") 
    274      
     274 
    275275    def _process(self): 
    276276        self._conf.getConfPaperReview().removeLayoutCriteria(self._criteria) 
    277277        self._redirect( urlHandlers.UHConfModifReviewingPaperSetup.getURL( self._conf ) ) 
    278          
     278 
    279279#################################### END of old classes that are not used anymore ############################### 
    280          
     280 
    281281class RHSetTemplate(RHConfModifReviewingPRMBase): 
    282282    _uh = urlHandlers.UHSetTemplate 
    283      
     283 
    284284    def _checkParams( self, params ): 
    285285        RHConfModifReviewingPRMBase._checkParams( self, params ) 
    … …  
    295295        except AttributeError: 
    296296            raise MaKaCError("Problem when storing template file") 
    297          
     297 
    298298    def _process( self ): 
    299299        import random 
    … …  
    306306            return "<html><head></head><body>%s</body></html>"  % simplejson.dumps({'status': 'OK', 
    307307                                     'info': {'name': self._name, 'description': self._description, 'format': self._format, 'id': self._id}}) 
    308          
     308 
    309309class RHDownloadTemplate(RHConferenceBaseDisplay): 
    310      
     310 
    311311    def _checkProtection(self): 
    312312        if self._target.hasEnabledSection("paperReviewing"): 
    … …  
    315315            raise MaKaCError(_("Paper Reviewing is not active for this conference")) 
    316316 
    317      
     317 
    318318    def _checkParams(self, params): 
    319319        RHConferenceBase._checkParams( self, params ) 
    320320        self._templateId = params.get("reviewingTemplateId") 
    321      
     321 
    322322    def _process(self): 
    323323        template=self._target.getConfPaperReview().getTemplates()[self._templateId].getFile() 
    … …  
    328328        self._req.headers_out["Content-Disposition"]="""inline; filename="%s\""""%template.getFileName() 
    329329        return template.readBin() 
    330      
     330 
    331331class RHDeleteTemplate(RHConfModifReviewingPRMBase): 
    332      
     332 
    333333    def _checkParams(self, params): 
    334334        RHConferenceBase._checkParams( self, params ) 
    335335        self._templateId = params.get("reviewingTemplateId") 
    336      
     336 
    337337    def _process(self): 
    338338        self._conf.getConfPaperReview().deleteTemplate(self._templateId) 
    339339        self._redirect(urlHandlers.UHConfModifReviewingPaperSetup.getURL( self._conf )) 
    340          

  • indico/MaKaC/webinterface/tpls/ConfModifAbstractReviewingSettings.tpl

    r6e9e95 r717e50  
    1 <table width="90%%" border="0"> 
     1<table width="90%%" border="0" style="padding-bottom: 10px;"> 
    22    <tr> 
    33        <td id="reviewingModeHelp" colspan="5" class="groupTitle" style="padding-bottom: 10px; padding-left: 20px;"> 
    … …  
    1111        <td class="blacktext" style="padding-top: 15px;"> 
    1212            <span id="inPlaceEditDefaultAbstractReviewerDueDate"> 
    13                 <% date = ConfReview.getAdjustedDefaultAbstractReviewerDueDate() %> 
     13                <% date = abstractReview.getAdjustedDefaultAbstractReviewerDueDate() %> 
    1414                <% if date is None: %> 
    1515                    <%= _("Date has not been set yet.")%> 
    … …  
    2323</table> 
    2424 
    25 <table> 
    26   <tr> 
    27     <th>Column 1 Heading</th> 
    28     <th>Column 2 Heading</th> 
    29   </tr> 
    30   <tr> 
    31     <td>Row 1: Col 1</td> 
    32     <td>Row 1: Col 2</td> 
    33   </tr> 
     25<table id="reviewingQuestionsTable" width="90%%" border="0" style="padding-bottom: 10px;"> 
     26    <tr> 
     27        <td id="reviewingQuestionsHelp" colspan="5" class="groupTitle" style="padding-bottom: 10px; padding-left: 20px;"><%= _("Add questions for abstract reviewing")%></td> 
     28    </tr> 
     29    <tr> 
     30        <td> 
     31            <div id="inPlaceEditQuestions"  style="padding-top: 5px;"><%= ', '.join(abstractReview.getReviewingQuestions())%></div> 
     32        </td> 
     33    </tr> 
    3434</table> 
    3535 
    … …  
    3939new IndicoUI.Widgets.Generic.dateEditor($E('inPlaceEditDefaultAbstractReviewerDueDate'), 
    4040                   'reviewing.conference.changeAbstractReviewerDefaultDueDate', 
    41                    {conference: '<%= ConfReview.getConference().getId() %>', 
     41                   {conference: '<%= abstractReview.getConference().getId() %>', 
    4242                    dueDateToChange: '<%= _("Abstract Reviewer")%>'}, 
    4343                   null, true); 
     44 
     45 
     46var showReviewingQuestions = function() { 
     47    new IndicoUI.Widgets.Generic.keywordField( 
     48        $E('inPlaceEditQuestions'), 
     49        'multipleLinesListItem', 
     50        'reviewing.conference.changeAbstractQuestions', 
     51        {conference: '<%= abstractReview.getConference().getId() %>'}, 
     52        $T('Remove this question from the list') 
     53    ); 
     54} 
     55 
     56showReviewingQuestions(); 
     57 
    4458</script> 
Note: See TracChangeset for help on using the changeset viewer.