Browse Source

tiny changes in i.org and iorg.el

tj 8 years ago
parent
commit
2ccf8da1fe
2 changed files with 87 additions and 5 deletions
  1. 86 2
      doc/worg/org-contrib/gsoc2012/student-projects/bugpile/i.org
  2. 1 3
      iorg/lisp/iorg.el

+ 86 - 2
doc/worg/org-contrib/gsoc2012/student-projects/bugpile/i.org

@@ -717,6 +717,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/create-project-uml-roa.png]]
+
 *** Edit project
     :PROPERTIES:
     :CUSTOM_ID: edit-project-uml-roa
@@ -733,6 +736,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-project-uml-roa.png]]
+
 *** Switch project
     :PROPERTIES:
     :CUSTOM_ID: switch-project-uml-roa
@@ -749,6 +755,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/switch-project-uml-roa.png]]
+
 *** Open new task
     :PROPERTIES:
     :CUSTOM_ID: open-new-task-uml-roa
@@ -784,6 +793,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-tasklist-uml-roa.png]]
+
 *** Take action on selected tasks
     :PROPERTIES:
     :CUSTOM_ID: take-action-tasks-uml-roa
@@ -799,6 +811,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/take-action-select-tasks-uml-roa.png]]
+
 *** Edit task
     :PROPERTIES:
     :CUSTOM_ID: edit-task-uml-roa
@@ -814,6 +829,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-task-uml-roa.png]]
+
 # *** Associate tasks and assignees 
 #     :PROPERTIES:
 #     :CUSTOM_ID: assoc-task-assignee-uml-roa
@@ -855,6 +873,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/add-comment-uml-roa.png]]
+
 *** Edit comment
     :PROPERTIES:
     :CUSTOM_ID: edit-comment-uml-roa
@@ -876,6 +897,9 @@ storing form data.
   endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-comment-uml-roa.png]]
+
 *** Add attachment
     :PROPERTIES:
     :CUSTOM_ID: add-attachment-uml-roa
@@ -891,6 +915,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/add-attachment-uml-roa.png]]
+
 *** Delete attachment
     :PROPERTIES:
     :CUSTOM_ID: delete-attachment-uml-roa
@@ -906,6 +933,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/delete-attachment-uml-roa.png]]
+
 *** Search event log 
     :PROPERTIES:
     :CUSTOM_ID: search-event-log-uml-roa
@@ -922,6 +952,9 @@ storing form data.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-event-log-uml-roa.png]]
+
 ** Use Case Models
    :PROPERTIES:
    :CUSTOM_ID: use-case-models
@@ -1070,9 +1103,14 @@ suffice.
     :CUSTOM_ID: bugpile-dom-class-model
     :END:
 
+The following symbol is used as a label for domain class models:
+
+| <dcm>  | Domain Class Model |
+
+
 #+srcname domain-class-uml
 #+begin_src plantuml :file ../../../../images/gsoc/2012/bugpile/domain-class-uml.png 
-  title Domain Class Model
+  title Domain Class Model <dcm>
   User : name\nemail\nrole
   Role : role_ALL
   Permissions : <<role-permissions>>
@@ -1338,6 +1376,9 @@ activity/:
  endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/create-project-uml-soa.png]]
+
 *** Edit project
     :PROPERTIES:
     :CUSTOM_ID: edit-project-uml-soa
@@ -1360,6 +1401,9 @@ activity/:
  endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-project-uml-soa.png]]
+
 *** Switch project
     :PROPERTIES:
     :CUSTOM_ID: switch-project-uml-soa
@@ -1378,6 +1422,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/switch-project-uml-soa.png]]
+
 *** Search tasklist
     :PROPERTIES:
     :CUSTOM_ID: search-task-list-uml-soa
@@ -1396,6 +1443,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-tasklist-uml-soa.png]]
+
 *** Take action on selected tasks
     :PROPERTIES:
     :CUSTOM_ID: take-action-tasks-uml-soa
@@ -1412,6 +1462,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/take-action-select-tasks-uml-soa.png]]
+
 *** Edit task
     :PROPERTIES:
     :CUSTOM_ID: edit-task-uml-soa
@@ -1427,6 +1480,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-task-uml-soa.png]]
+
 
 # *** Associate tasks and assignees 
 #     :PROPERTIES:
@@ -1474,6 +1530,9 @@ activity/:
  endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/add-comment-uml-soa.png]]
+
 *** Edit comment
     :PROPERTIES:
     :CUSTOM_ID: edit-comment-uml-soa
@@ -1501,6 +1560,9 @@ activity/:
     endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/edit-comment-uml-soa.png]]
+
 *** Add attachment
     :PROPERTIES:
     :CUSTOM_ID: add-attachment-uml-soa
@@ -1521,6 +1583,9 @@ activity/:
  endif
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/add-attachment-uml-soa.png]]
+
 *** Delete attachment
     :PROPERTIES:
     :CUSTOM_ID: delete-attachment-uml-soa
@@ -1537,6 +1602,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/delete-attachment-uml-soa.png]]
+
 *** Search event log 
     :PROPERTIES:
     :CUSTOM_ID: search-event-log-uml-soa
@@ -1555,6 +1623,9 @@ activity/:
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-event-log-uml-soa.png]]
+
 ** Complex System Activities
    :PROPERTIES:
    :CUSTOM_ID: syst-activities
@@ -1599,6 +1670,9 @@ included as subactivity in many use cases.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-tasks-uml-csa.png]]
+
 *** Search Users
     :PROPERTIES:
     :CUSTOM_ID: search-users-syst-act-spec
@@ -1617,6 +1691,9 @@ activity (compared to querying tasks), only performed by /admins/.
   --> (*)
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/search-users-uml-csa.png]]
+
 * Software Architecture
   :PROPERTIES:
   :CUSTOM_ID: softw-arch
@@ -1889,6 +1966,10 @@ following class model:
   User <|-- Assignee
   Assignee <|-- Admin
 #+end_src
+
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/bugpile-users-example-class-model.png]]
+
  
 The relationship between users, roles and permissions can be modeled
 like this: 
@@ -1903,6 +1984,9 @@ like this:
   Role "1..*" -left- "1..*" Permission
 #+end_src
 
+#+results:
+[[file:../../../../images/gsoc/2012/bugpile/bugpile-users-roles-class-model.png]]
+
 
 To transform these class diagrams into Org files we need one
 =/objects/classes/<<class-name>>-class.org= file for each class:
@@ -1920,7 +2004,7 @@ To transform these class diagrams into Org files we need one
 
 #+begin_src org :exports source
   ,# class /objects/classes/assignee-class.org
-  , * assignee
+  ,* assignee
   ,  :PROPERTIES:
   ,  :super:    user
   ,  :public-key: nil

+ 1 - 3
iorg/lisp/iorg.el

@@ -5,8 +5,7 @@
 ;; [not yet: Free Software Foundation, Inc.]
 ;;
 ;; Author: Thorsten Jolitz <tjolitz at gmail dot com>
-;; Co-Author: Eric Schulte  <... at...dot...>
-;; Co-Author: Nic Ferrier  <... at...dot...>
+;; Co-Author: Eric Schulte <eric dot schulte at gmx dot com>
 ;; Keywords: web-applications, interactive, Org-mode, elnode, dvcs
 ;; Homepage:
 ;; http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/bugpile/i.org
@@ -94,7 +93,6 @@
 
 
 ;;;; Variables
-
 (defvar iorg-plantuml-diagram-type-repexp
 (concat "<\\(soa\\|csa\\|dcm\\)>")
   "Regexp used to identify plantuml diagramtypes from the