Index: openacs-4/contrib/packages/simulation/tcl/message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/message-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/simulation/tcl/message-procs.tcl	26 Jan 2004 14:21:02 -0000	1.3
+++ openacs-4/contrib/packages/simulation/tcl/message-procs.tcl	26 Jan 2004 15:23:37 -0000	1.4
@@ -97,7 +97,7 @@
 
         notification::new \
             -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
-            -object_id $case(workflow_id) \
+            -object_id [ad_conn package_id] \
             -notif_subject $notif_subject \
             -notif_text $notif_body \
             -action_id $item_id \
Index: openacs-4/contrib/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/tcl/Attic/template-procs.tcl,v
diff -u -r1.61 -r1.62
--- openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	26 Jan 2004 14:21:02 -0000	1.61
+++ openacs-4/contrib/packages/simulation/tcl/template-procs.tcl	26 Jan 2004 15:23:37 -0000	1.62
@@ -530,7 +530,7 @@
     notification::request::new \
         -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
         -user_id $user_id \
-        -object_id $workflow_id \
+        -object_id [ad_conn package_id] \
         -interval_id [notification::get_interval_id -name "instant"] \
         -delivery_method_id [notification::get_delivery_method_id -name "email"]
 }
Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:37:28 -0000	1.13
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.adp	26 Jan 2004 15:23:38 -0000	1.14
@@ -14,6 +14,7 @@
   <li><if @task_count@ eq 1><a href="@tasks_url@">@task_count@ task</a></if><else><a href="@tasks_url@">@task_count@ tasks</a></else>
   <li><a href="@portfolio_url@">Portfolio</a>
   <li><a href="@about_sim_url@">About this simulation</a>
+  <li><a href="@notifications_url@">My Notifications</a>
 </ul>
 <h4>Contacts</h4>
 <ul>
Index: openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/control-bar.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl	23 Jan 2004 15:35:18 -0000	1.13
+++ openacs-4/contrib/packages/simulation/www/simplay/control-bar.tcl	26 Jan 2004 15:23:38 -0000	1.14
@@ -91,3 +91,5 @@
 " {
     set character_url [simulation::object::url -name $character_name]
 }
+
+set notifications_url [export_vars -base notifications { case_id role_id }]
Index: openacs-4/contrib/packages/simulation/www/simplay/notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/notifications.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simplay/notifications.adp	26 Jan 2004 15:23:38 -0000	1.1
@@ -0,0 +1,45 @@
+<master src="/packages/simulation/www/simulation-master">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<table cellspacing="1" cellpadding="3" class="bt_listing">
+  <tr class="bt_listing_header">
+    <th colspan="2">Notifications for</th>
+    <th>Subscribe</th>
+    <th>Unsubscribe</th>
+  </tr>
+  <multiple name="notifications">
+    <if @notifications.rownum@ odd>
+      <tr class="bt_listing_odd">
+    </if>
+    <else>
+      <tr class="bt_listing_even">
+    </else>
+      <td align="center" class="bt_listing_narrow">
+        <if @notifications.subscribed_p@ true>
+          <b>&raquo;</b>
+        </if>
+        <else>
+          &nbsp;
+        </else>
+      </td>
+      <td class="bt_listing">
+        @notifications.label@
+      </td>
+      <td class="bt_listing">
+        <if @notifications.subscribed_p@ false>
+          <a href="@notifications.url@" title="@notifications.title@">Subscribe</a>
+        </if>
+      </td>
+      <td class="bt_listing">
+        <if @notifications.subscribed_p@ true>
+          <a href="@notifications.url@" title="@notifications.title@">Unsubscribe</a>
+        </if>
+      </td>
+    </tr>
+  </multiple>
+</table>
+
+<p>
+  <a href="@manage_url@" class="action">Manage your notifications</a>
+</p>
Index: openacs-4/contrib/packages/simulation/www/simplay/notifications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/notifications.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/simulation/www/simplay/notifications.tcl	26 Jan 2004 15:23:38 -0000	1.1
@@ -0,0 +1,65 @@
+ad_page_contract {
+    Manage bug-tracker notifications
+} {
+    case_id:integer
+    role_id:integer
+}
+
+simulation::case::get -case_id $case_id -array case
+set case_url [export_vars -base case { case_id role_id }]
+
+set page_title "Notifications"
+set context [list [list "." "SimPlay"] [list $case_url $case(label)] $page_title]
+
+set user_id [ad_conn user_id]
+set return_url [ad_return_url]
+
+multirow create notifications url label title subscribed_p
+
+foreach type { 
+    workflow_assignee simplay_message
+} {
+    switch $type {
+        workflow_assignee {
+            set pretty_name "all tasks you're assigned to"
+        }
+        simplay_message {
+            set pretty_name "all messages you receive"
+        }
+        default {
+            error "Unknown type"
+        }
+    }
+
+    # Get the type id
+    set type_id [notification::type::get_type_id -short_name $type]
+
+    # Check if subscribed
+    set request_id [notification::request::get_request_id \
+                        -type_id $type_id \
+                        -object_id [ad_conn package_id] \
+                        -user_id $user_id]
+
+    set subscribed_p [expr ![empty_string_p $request_id]]
+    
+    if { $subscribed_p } {
+        set url [notification::display::unsubscribe_url -request_id $request_id -url $return_url]
+    } else {
+        set url [notification::display::subscribe_url \
+                     -type $type \
+                     -object_id [ad_conn package_id] \
+                     -url $return_url \
+                     -user_id $user_id \
+                     -pretty_name $pretty_name]
+    }
+
+    if { ![empty_string_p $url] } {
+        multirow append notifications \
+            $url \
+            [string totitle $pretty_name] \
+            [ad_decode $subscribed_p 1 "Unsubscribe from $pretty_name" "Subscribe to $pretty_name"] \
+            $subscribed_p
+    }
+}
+
+set manage_url "[apm_package_url_from_key [notification::package_key]]manage"
Index: openacs-4/packages/simulation/tcl/message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/message-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simulation/tcl/message-procs.tcl	26 Jan 2004 14:21:02 -0000	1.3
+++ openacs-4/packages/simulation/tcl/message-procs.tcl	26 Jan 2004 15:23:37 -0000	1.4
@@ -97,7 +97,7 @@
 
         notification::new \
             -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
-            -object_id $case(workflow_id) \
+            -object_id [ad_conn package_id] \
             -notif_subject $notif_subject \
             -notif_text $notif_body \
             -action_id $item_id \
Index: openacs-4/packages/simulation/tcl/template-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/template-procs.tcl,v
diff -u -r1.61 -r1.62
--- openacs-4/packages/simulation/tcl/template-procs.tcl	26 Jan 2004 14:21:02 -0000	1.61
+++ openacs-4/packages/simulation/tcl/template-procs.tcl	26 Jan 2004 15:23:37 -0000	1.62
@@ -530,7 +530,7 @@
     notification::request::new \
         -type_id [notification::type::get_type_id -short_name [simulation::notification::message::type_short_name]] \
         -user_id $user_id \
-        -object_id $workflow_id \
+        -object_id [ad_conn package_id] \
         -interval_id [notification::get_interval_id -name "instant"] \
         -delivery_method_id [notification::get_delivery_method_id -name "email"]
 }
Index: openacs-4/packages/simulation/www/simplay/control-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/simulation/www/simplay/control-bar.adp	12 Jan 2004 15:37:28 -0000	1.13
+++ openacs-4/packages/simulation/www/simplay/control-bar.adp	26 Jan 2004 15:23:38 -0000	1.14
@@ -14,6 +14,7 @@
   <li><if @task_count@ eq 1><a href="@tasks_url@">@task_count@ task</a></if><else><a href="@tasks_url@">@task_count@ tasks</a></else>
   <li><a href="@portfolio_url@">Portfolio</a>
   <li><a href="@about_sim_url@">About this simulation</a>
+  <li><a href="@notifications_url@">My Notifications</a>
 </ul>
 <h4>Contacts</h4>
 <ul>
Index: openacs-4/packages/simulation/www/simplay/control-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/control-bar.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/simulation/www/simplay/control-bar.tcl	23 Jan 2004 15:35:18 -0000	1.13
+++ openacs-4/packages/simulation/www/simplay/control-bar.tcl	26 Jan 2004 15:23:38 -0000	1.14
@@ -91,3 +91,5 @@
 " {
     set character_url [simulation::object::url -name $character_name]
 }
+
+set notifications_url [export_vars -base notifications { case_id role_id }]
Index: openacs-4/packages/simulation/www/simplay/notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/notifications.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simplay/notifications.adp	26 Jan 2004 15:23:38 -0000	1.1
@@ -0,0 +1,45 @@
+<master src="/packages/simulation/www/simulation-master">
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<table cellspacing="1" cellpadding="3" class="bt_listing">
+  <tr class="bt_listing_header">
+    <th colspan="2">Notifications for</th>
+    <th>Subscribe</th>
+    <th>Unsubscribe</th>
+  </tr>
+  <multiple name="notifications">
+    <if @notifications.rownum@ odd>
+      <tr class="bt_listing_odd">
+    </if>
+    <else>
+      <tr class="bt_listing_even">
+    </else>
+      <td align="center" class="bt_listing_narrow">
+        <if @notifications.subscribed_p@ true>
+          <b>&raquo;</b>
+        </if>
+        <else>
+          &nbsp;
+        </else>
+      </td>
+      <td class="bt_listing">
+        @notifications.label@
+      </td>
+      <td class="bt_listing">
+        <if @notifications.subscribed_p@ false>
+          <a href="@notifications.url@" title="@notifications.title@">Subscribe</a>
+        </if>
+      </td>
+      <td class="bt_listing">
+        <if @notifications.subscribed_p@ true>
+          <a href="@notifications.url@" title="@notifications.title@">Unsubscribe</a>
+        </if>
+      </td>
+    </tr>
+  </multiple>
+</table>
+
+<p>
+  <a href="@manage_url@" class="action">Manage your notifications</a>
+</p>
Index: openacs-4/packages/simulation/www/simplay/notifications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/notifications.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/simulation/www/simplay/notifications.tcl	26 Jan 2004 15:23:38 -0000	1.1
@@ -0,0 +1,65 @@
+ad_page_contract {
+    Manage bug-tracker notifications
+} {
+    case_id:integer
+    role_id:integer
+}
+
+simulation::case::get -case_id $case_id -array case
+set case_url [export_vars -base case { case_id role_id }]
+
+set page_title "Notifications"
+set context [list [list "." "SimPlay"] [list $case_url $case(label)] $page_title]
+
+set user_id [ad_conn user_id]
+set return_url [ad_return_url]
+
+multirow create notifications url label title subscribed_p
+
+foreach type { 
+    workflow_assignee simplay_message
+} {
+    switch $type {
+        workflow_assignee {
+            set pretty_name "all tasks you're assigned to"
+        }
+        simplay_message {
+            set pretty_name "all messages you receive"
+        }
+        default {
+            error "Unknown type"
+        }
+    }
+
+    # Get the type id
+    set type_id [notification::type::get_type_id -short_name $type]
+
+    # Check if subscribed
+    set request_id [notification::request::get_request_id \
+                        -type_id $type_id \
+                        -object_id [ad_conn package_id] \
+                        -user_id $user_id]
+
+    set subscribed_p [expr ![empty_string_p $request_id]]
+    
+    if { $subscribed_p } {
+        set url [notification::display::unsubscribe_url -request_id $request_id -url $return_url]
+    } else {
+        set url [notification::display::subscribe_url \
+                     -type $type \
+                     -object_id [ad_conn package_id] \
+                     -url $return_url \
+                     -user_id $user_id \
+                     -pretty_name $pretty_name]
+    }
+
+    if { ![empty_string_p $url] } {
+        multirow append notifications \
+            $url \
+            [string totitle $pretty_name] \
+            [ad_decode $subscribed_p 1 "Unsubscribe from $pretty_name" "Subscribe to $pretty_name"] \
+            $subscribed_p
+    }
+}
+
+set manage_url "[apm_package_url_from_key [notification::package_key]]manage"