[Logicampus-cvs] logicampus/src/logicreate/services/classmgr assignmentManage.lcp, 1.25, 1.26 lesso
Brought to you by:
trilexcom
Menu
▾
▴
[Logicampus-cvs] logicampus/src/logicreate/services/classmgr assignmentManage.lcp, 1.25, 1.26 lessonManager.lcp, 1.41, 1.42
|
From: Mark K <har...@us...> - 2007-10-08 17:02:19
|
Update of /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25621/services/classmgr Modified Files: assignmentManage.lcp lessonManager.lcp Log Message: Rework the gradebook to accept activity grades based on lesson sequence ID Index: assignmentManage.lcp =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/assignmentManage.lcp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** assignmentManage.lcp 8 Oct 2007 14:21:07 -0000 1.25 --- assignmentManage.lcp 8 Oct 2007 17:02:14 -0000 1.26 *************** *** 511,524 **** $lc->getvars['student'] = trim($lc->getvars['student']); $lc->getvars['student'] = addslashes(stripslashes( $lc->getvars['student'])); ! $db->query('SELECT A.id_class_assignments ! FROM class_assignments A ! WHERE id_class_assignments = '.$lc->getvars['id_class_assignments'].' ! AND id_classes = '.$u->activeClassTaught->id_classes); if (! $db->nextRecord() ) { $this->presentor = 'errorMessage'; $t['message'] = "You don't have permission to alter grades for this assignment"; ! $t['details'] = $lc->getvars['id_class_assignments'] . " is not an assignment ID that is owned by you or your current class."; return; } --- 511,531 ---- $lc->getvars['student'] = trim($lc->getvars['student']); $lc->getvars['student'] = addslashes(stripslashes( $lc->getvars['student'])); + $username = addslashes(stripslashes( $lc->getvars['student'])); + $db->query('SELECT pkey from lcUsers where username="'.$lc->getvars['student'].'"'); + $db->nextRecord(); + $db->freeResult(); + $studentId = $db->record['pkey']; ! $activityId = intval($lc->postvars['seqId']); ! ! $db->query('SELECT A.class_lesson_sequence_id ! FROM class_lesson_sequence A ! WHERE A.class_lesson_sequence_id = '.$activityId.' ! AND A.class_id = '.$u->activeClassTaught->id_classes); if (! $db->nextRecord() ) { $this->presentor = 'errorMessage'; $t['message'] = "You don't have permission to alter grades for this assignment"; ! $t['details'] = $lc->getvars['seqId'] . " is not an assignment ID that is owned by you or your current class."; return; } *************** *** 534,539 **** SELECT id_class_assignments_grades, grade, comments FROM class_assignments_grades ! WHERE (id_class_assignments='.$lc->getvars['id_class_assignments'].' ! AND id_student=\''.$lc->getvars['student'].'\') '; --- 541,546 ---- SELECT id_class_assignments_grades, grade, comments FROM class_assignments_grades ! WHERE (id_class_assignments='.$activityId.' ! AND id_student=\''.$username.'\') '; *************** *** 547,552 **** if ( $db->getNumRows() > 1 ) { $db->query('DELETE FROM class_assignments_grades ! WHERE (id_class_assignments='.$lc->getvars['id_class_assignments'].' ! AND id_student=\''.$lc->getvars['student'].'\')'); $db->record['id_class_assignments_grades'] = 0; --- 554,559 ---- if ( $db->getNumRows() > 1 ) { $db->query('DELETE FROM class_assignments_grades ! WHERE (id_class_assignments='.$activityId.' ! AND id_student=\''.$username.'\')'); $db->record['id_class_assignments_grades'] = 0; *************** *** 569,573 **** comments=\''. str_replace("'", '\'\'', stripslashes($lc->postvars['teachercomments'])). '\', grade='. number_format($lc->postvars['grade'], 2). ', ! id_student=\''.$lc->getvars['student'].'\' '; $db->query($sql); --- 576,580 ---- comments=\''. str_replace("'", '\'\'', stripslashes($lc->postvars['teachercomments'])). '\', grade='. number_format($lc->postvars['grade'], 2). ', ! id_student=\''.$username.'\' '; $db->query($sql); *************** *** 577,591 **** //assignment_grades has been updated, let's find an associated GBE, if there is one we will push a new GBV $entryObj = ClassGradebookEntries::load( ! array('assignment_id'=>$lc->getvars['id_class_assignments'], 'id_classes'=>$u->activeClassTaught->id_classes) ); if ( is_object($entryObj) ) { $gbvObj = ClassGradebookVal::load( array('id_class_gradebook_entries'=>$entryObj->idClassGradebookEntries, ! 'username'=>$lc->getvars['student']) ); if (!is_object($gbvObj) ) { $gbvObj = new ClassGradebookVal(); $gbvObj->set('idClassGradebookEntries',$entryObj->idClassGradebookEntries); $gbvObj->set('idClasses',$u->activeClassTaught->id_classes); ! $gbvObj->set('username',$lc->getvars['student']); } $gbvObj->set('comments',$lc->postvars['teachercomments']); --- 584,598 ---- //assignment_grades has been updated, let's find an associated GBE, if there is one we will push a new GBV $entryObj = ClassGradebookEntries::load( ! array('class_lesson_sequence_id'=>$activityId, 'id_classes'=>$u->activeClassTaught->id_classes) ); if ( is_object($entryObj) ) { $gbvObj = ClassGradebookVal::load( array('id_class_gradebook_entries'=>$entryObj->idClassGradebookEntries, ! 'student_id'=>$studentId) ); if (!is_object($gbvObj) ) { $gbvObj = new ClassGradebookVal(); $gbvObj->set('idClassGradebookEntries',$entryObj->idClassGradebookEntries); $gbvObj->set('idClasses',$u->activeClassTaught->id_classes); ! $gbvObj->set('studentId',$studentId); } $gbvObj->set('comments',$lc->postvars['teachercomments']); *************** *** 596,600 **** $this->presentor = 'redirectPresentation'; ! $t['url'] = appurl('classmgr/assignmentManage/event=viewAssignment/id_class_assignments='.$lc->getvars['id_class_assignments']); return; } --- 603,607 ---- $this->presentor = 'redirectPresentation'; ! $t['url'] = appurl('classmgr/assignmentManage/event=viewAssignment/id='.$activityId); return; } Index: lessonManager.lcp =================================================================== RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** lessonManager.lcp 8 Oct 2007 14:21:07 -0000 1.41 --- lessonManager.lcp 8 Oct 2007 17:02:14 -0000 1.42 *************** *** 115,119 **** $colD->justify='left'; - $colB = &$columnModel->getColumnAt(2); $colB->maxWidth=64; --- 115,118 ---- *************** *** 879,883 **** $t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24); $t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24); - } --- 878,881 ---- *************** *** 916,927 **** $colD->justify='left'; ! $col = &$columnModel->getColumnAt(4); ! $col->maxWidth=64; ! $col->name = 'Rank'; ! $col->cellRenderer = new LC_Table_SequenceRenderer(); ! $col->cellRenderer->id = $lessonId; ! ! $colB = &$columnModel->getColumnAt(2); $colB->maxWidth=64; $colB->name = 'Start'; --- 914,926 ---- $colD->justify='left'; ! //create a gradebook entry column ! $column = new LC_TableColumn(); ! $column->setName( "Gradebook" ); ! $column->cellRenderer = new LC_TableStaticRenderer(); ! $column->cellRenderer->values = array(2=>'no entry'); ! $column->maxWidth=128; ! $table->addColumnAt(2,$column); ! $colB = &$columnModel->getColumnAt(3); $colB->maxWidth=64; $colB->name = 'Start'; *************** *** 934,938 **** } ! $colC = &$columnModel->getColumnAt(3); $colC->maxWidth=64; $colC->name = 'Due'; --- 933,937 ---- } ! $colC = &$columnModel->getColumnAt(4); $colC->maxWidth=64; $colC->name = 'Due'; *************** *** 945,948 **** --- 944,952 ---- } + $col = &$columnModel->getColumnAt(5); + $col->maxWidth=64; + $col->name = 'Rank'; + $col->cellRenderer = new LC_Table_SequenceRenderer(); + $col->cellRenderer->id = $lessonId; *************** *** 950,956 **** $t['id'] = $lesson_id; - - - } --- 954,957 ---- *************** *** 1204,1208 **** } - - ?> --- 1205,1207 ---- |
