Merge lp:~ivle-dev/ivle/exercise-ui into lp:ivle

[Nick Chadwick]

[Nick Chadwick (chadnickbok)]

Commit message: Merged exercise-ui branch.

This introduces a new interface for creating, modifying and deleting exercises. In addition, this branch includes an RST option for Worksheets, which can now be written purely in RST, and converted to XML on-the-fly.

[lp:~ivle-dev/ivle/exercise-ui]

1329. By Nick Chadwick on 2009-03-09

Removeed nltkdoc.css, as it is not needed and was added accidentally.

[William Grant (wgrant)]

- ivle.database has some XHTML in it! Please obliterate it.
- ExerciseDeleteView.remove_exercise() should be a method of Exercise.
- ExerciseDeleteView.populate() confuses me.
- The authorisation mechanisms for Exercise editing need to be factored out. Probably into Exercise.get_permissions() itself.
- Somebody (probably me) also needs to fix the jQuery symlink (maybe make the installer do it?)

More to come. I didn't get through even 10% of it.

review: Needs Fixing

[William Grant (wgrant)]

- ivle.database has some XHTML in it! Please obliterate it.
- ExerciseDeleteView:
  + remove_exercise() should be a method of Exercise.
  + populate() confuses me.
- ExercisesRESTView:
  + get_permissions() doesn't make sense - why would the user be a member of the request's user's offering roles? Also, you don't have req at all there.
- ExerciseRESTView:
  + get_permissions(): same as ExercisesRESTView.
  + edit_exercise() returns {'result': 'moo'}.
  + delete_exercise() might not work, and duplicates ExerciseDeleteView.remove_exercise().
  + delete_suite()'s guts belong in TestSuite.
  + ExerciseRESTView.(add|edit)_var(): One casts argno to an int, the other doesn't. Why?

- The authorization mechanisms for Exercise editing need to be factored out. Probably into Exercise.get_permissions() itself.
- There are lots of NotFound('someobject')s.
- Somebody (probably me) also needs to fix the jQuery symlink (maybe make the installer do it?)

[William Grant (wgrant)]

- exercise_delete.html screams that it wants two <py:choose>s.
- worksheet_edit.html says that it is under development. Is that true?
- ivle.worksheet.rst probably doesn't want a shebang at all.

I think that's it.

[lp:~ivle-dev/ivle/exercise-ui]

1330. By Nick Chadwick on 2009-03-10

Slightly modified the display of the list in the exercises view.

1331. By Nick Chadwick on 2009-03-10

Removed XML from database. RST now generates a full xml document, not
just a fragment.

1332. By Nick Chadwick on 2009-03-10

Exercise objects in the database module, along with their test cases,
now have delete() methods, which allow for 'safe' removal. Calling
this method will only delete an exercise if it has no saves or attempts
associated with it.

Updated ExerciseDeleteView to make use of this new functionality.

Updated ExerciseDeleteView, and its template, to be clearer in their
control flow.

1333. By Nick Chadwick on 2009-03-10

Permissions for editing and deleting exercises now come from the
Exercise's get_permissions, which checks to see if the user is
a lecturer in any enrolment, or an admin.

1334. By Nick Chadwick on 2009-03-10

Made checking if a user is a lecturer in exercise get_permissions
slightly more elegant.

1335. By Nick Chadwick on 2009-03-10

Fixed a syntax error.

1336. By Nick Chadwick on 2009-03-10

Updated exercise_service to make use of the new deletion methods
for exercises and tests.

1337. By Nick Chadwick on 2009-03-10

Removed some extraneous output in exercise REST views, when encountering
exceptions.

These views should only ever be accessed via REST, so no detailed
explanation is useful.

1338. By Nick Chadwick on 2009-03-10

Worksheet Edit is no longer under development. The comment saying so
has been removed.

[Nick Chadwick (chadnickbok)]

Having considered your suggestions, I have updated the branch accordingly.

2009/3/9 William Grant <email address hidden>

> - exercise_delete.html screams that it wants two <py:choose>s.
> - worksheet_edit.html says that it is under development. Is that true?
> - ivle.worksheet.rst probably doesn't want a shebang at all.
>
> I think that's it.
> --
> https://code.edge.launchpad.net/~ivle-dev/ivle/exercise-ui/+merge/4295<https://code.edge.launchpad.net/%7Eivle-dev/ivle/exercise-ui/+merge/4295>
> Your team IVLE Developers is subscribed to branch
> lp:~ivle-dev/ivle/exercise-ui.
>

--

-Nick

[lp:~ivle-dev/ivle/exercise-ui]

1339. By Nick Chadwick on 2009-03-10

Removed a shebang from rst.py, as it no longer has any real main
function.

1340. By Nick Chadwick on 2009-03-10

Merged from trunk.

[William Grant (wgrant)]

Looks good, though I object to *.delete() returning false. IMO it should raise an exception instead.

[William Grant (wgrant)]

On Tue, 2009-03-10 at 21:11 +0000, William Grant wrote:
> Looks good, though I object to *.delete() returning false. IMO it should raise an exception instead.

Also, why does it take a store? Store.of(self) should do fine.

[lp:~ivle-dev/ivle/exercise-ui]

1341. By Nick Chadwick on 2009-03-17

Fixed a problem with exercise editor, which wasn't editing or adding
variables properly.

Fixed the final issues from the merge-proposal, which make deleting
exercises use appropriate functions, which now raise exceptions
if they fail.

[William Grant (wgrant)]

Looks reasonable to me.

review: Approve

[lp:~ivle-dev/ivle/exercise-ui]

1342. By William Grant on 2009-03-17

Merge from trunk.