Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -N -r1.34 -r1.35 --- openacs-4/packages/dotlrn/dotlrn.info 21 Jan 2002 22:11:30 -0000 1.34 +++ openacs-4/packages/dotlrn/dotlrn.info 22 Jan 2002 00:13:09 -0000 1.35 @@ -44,13 +44,14 @@ - + + @@ -98,6 +99,14 @@ + + + + + + + + @@ -108,6 +117,9 @@ + + + @@ -163,6 +175,7 @@ + @@ -173,6 +186,9 @@ + + + @@ -188,6 +204,7 @@ + @@ -206,9 +223,15 @@ + + + + + + @@ -231,6 +254,8 @@ + + Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-classes-create.sql,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql 11 Jan 2002 06:33:26 -0000 1.13 +++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql 22 Jan 2002 00:13:09 -0000 1.14 @@ -11,26 +11,28 @@ -- @version $Id$ -- -create table dotlrn_classes ( - class_key constraint dotlrn_class_class_key_fk - references dotlrn_community_types(community_type) - constraint dotlrn_class_class_key_pk - primary key +create table dotlrn_departments ( + department_key constraint dotlrn_departments_dept_key_fk + references dotlrn_community_types (community_type) + constraint dotlrn_departments_pk + primary key, + external_url varchar2(4000) ); -create or replace view dotlrn_classes_full +create or replace view dotlrn_departments_full as - select dotlrn_classes.class_key, + select dotlrn_departments.department_key, dotlrn_community_types.pretty_name, dotlrn_community_types.description, dotlrn_community_types.package_id, dotlrn_community_types.supertype, (select site_node.url(site_nodes.node_id) from site_nodes - where site_nodes.object_id = dotlrn_community_types.package_id) as url - from dotlrn_classes, + where site_nodes.object_id = dotlrn_community_types.package_id) as url, + dotlrn_departments.external_url + from dotlrn_departments, dotlrn_community_types - where dotlrn_classes.class_key = dotlrn_community_types.community_type; + where dotlrn_departments.department_key = dotlrn_community_types.community_type; create table dotlrn_terms ( term_id integer @@ -52,6 +54,32 @@ not null ); +create table dotlrn_classes ( + class_key constraint dotlrn_classes_class_key_fk + references dotlrn_community_types (community_type) + constraint dotlrn_classes_pk + primary key, + department_key constraint dotlrn_classes_dept_key_fk + references dotlrn_departments (department_key) + constraint dotlrn_classes_dept_key_nn + not null +); + +create or replace view dotlrn_classes_full +as + select dotlrn_classes.class_key, + dotlrn_community_types.pretty_name, + dotlrn_community_types.description, + dotlrn_community_types.package_id, + dotlrn_community_types.supertype, + (select site_node.url(site_nodes.node_id) + from site_nodes + where site_nodes.object_id = dotlrn_community_types.package_id) as url, + dotlrn_classes.department_key + from dotlrn_classes, + dotlrn_community_types + where dotlrn_classes.class_key = dotlrn_community_types.community_type; + create table dotlrn_class_instances ( class_instance_id constraint dotlrn_ci_class_instance_id_fk references dotlrn_communities (community_id) @@ -104,12 +132,85 @@ from dotlrn_class_instances_full where active_end_date >= sysdate; +create or replace package dotlrn_department +is + function new ( + department_key in dotlrn_departments.department_key%TYPE, + pretty_name in dotlrn_community_types.pretty_name%TYPE, + pretty_plural in acs_object_types.pretty_plural%TYPE default null, + description in dotlrn_community_types.description%TYPE, + package_id in dotlrn_community_types.package_id%TYPE default null, + creation_date in acs_objects.creation_date%TYPE default sysdate, + creation_user in acs_objects.creation_user%TYPE default null, + creation_ip in acs_objects.creation_ip%TYPE default null, + context_id in acs_objects.context_id%TYPE default null + ) return dotlrn_departments.department_key%TYPE; + + procedure delete ( + department_key in dotlrn_departments.department_key%TYPE + ); +end; +/ +show errors + +create or replace package body dotlrn_department +is + function new ( + department_key in dotlrn_departments.department_key%TYPE, + pretty_name in dotlrn_community_types.pretty_name%TYPE, + pretty_plural in acs_object_types.pretty_plural%TYPE default null, + description in dotlrn_community_types.description%TYPE, + package_id in dotlrn_community_types.package_id%TYPE default null, + creation_date in acs_objects.creation_date%TYPE default sysdate, + creation_user in acs_objects.creation_user%TYPE default null, + creation_ip in acs_objects.creation_ip%TYPE default null, + context_id in acs_objects.context_id%TYPE default null + ) return dotlrn_departments.department_key%TYPE + is + v_department_key dotlrn_departments.department_key%TYPE; + begin + v_department_key := dotlrn_community_type.new ( + community_type => department_key, + parent_type => 'dotlrn_class_instance', + pretty_name => pretty_name, + pretty_plural => pretty_plural, + description => description, + package_id => package_id, + creation_date => creation_date, + creation_user => creation_user, + creation_ip => creation_ip, + context_id => context_id + ); + + insert + into dotlrn_departments + (department_key) values (v_department_key); + + return v_department_key; + end; + + procedure delete ( + department_key in dotlrn_departments.department_key%TYPE + ) + is + begin + delete + from dotlrn_departments + where department_key = department_key; + + dotlrn_community_type.delete(department_key); + end; +end; +/ +show errors + create or replace package dotlrn_class is function new ( class_key in dotlrn_classes.class_key%TYPE, - pretty_name in dotlrn_communities.pretty_name%TYPE, - pretty_plural in dotlrn_community_types.pretty_name%TYPE default null, + department_key in dotlrn_departments.department_key%TYPE, + pretty_name in dotlrn_community_types.pretty_name%TYPE, + pretty_plural in acs_object_types.pretty_plural%TYPE default null, description in dotlrn_community_types.description%TYPE, package_id in dotlrn_community_types.package_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, @@ -129,8 +230,9 @@ is function new ( class_key in dotlrn_classes.class_key%TYPE, - pretty_name in dotlrn_communities.pretty_name%TYPE, - pretty_plural in dotlrn_community_types.pretty_name%TYPE default null, + department_key in dotlrn_departments.department_key%TYPE, + pretty_name in dotlrn_community_types.pretty_name%TYPE, + pretty_plural in acs_object_types.pretty_plural%TYPE default null, description in dotlrn_community_types.description%TYPE, package_id in dotlrn_community_types.package_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, @@ -143,7 +245,7 @@ begin v_class_key := dotlrn_community_type.new ( community_type => class_key, - parent_type => 'dotlrn_class', + parent_type => department_key, pretty_name => pretty_name, pretty_plural => pretty_plural, description => description, @@ -156,7 +258,7 @@ insert into dotlrn_classes - (class_key) values (v_class_key); + (class_key, department_key) values (v_class_key, department_key); return v_class_key; end; Index: openacs-4/packages/dotlrn/tcl/class-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/class-procs-oracle.xql,v diff -u -N --- openacs-4/packages/dotlrn/tcl/class-procs-oracle.xql 17 Dec 2001 23:02:55 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ - - - - oracle8.1.6 - - - - declare - begin - :1 := dotlrn_class.new( - class_key => :name, - pretty_name => :pretty_name, - pretty_plural => :pretty_name, - description => :description - ); - end; - - - Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/dotlrn/tcl/class-procs.tcl 10 Jan 2002 19:30:17 -0000 1.20 +++ openacs-4/packages/dotlrn/tcl/class-procs.tcl 22 Jan 2002 00:13:09 -0000 1.21 @@ -64,10 +64,10 @@ } ad_proc -public new { - {-description ""} {-class_key:required} + {-department_key:required} {-pretty_name:required} - {-parent_type "dotlrn_class_instance"} + {-description ""} } { Creates a new class, like "Structure and Interpretation of Computer Programs." The return value is the short class name, a key that works in SQL, and that uniquely @@ -76,47 +76,45 @@ This class can then be instantiated for a particular semester. } { db_transaction { - # create the community type set class_key [dotlrn_community::new_type \ - -description $description \ - -community_type_key $class_key \ - -parent_type $parent_type \ - -pretty_name $pretty_name] + -community_type_key $class_key \ + -parent_type $department_key \ + -pretty_name $pretty_name \ + -description $description] - # insert the class row (this would be much easier if object types were objects, too - ben) db_dml insert_class {} } } ad_proc -public new_instance { - {-class_type:required} + {-class_key:required} {-term_id:required} {-pretty_name ""} {-description ""} - {-join_policy "needs approval"} + {-join_policy "closed"} } { Creates a new instance of a class for a particular term and year, and returns the class instance key. } { # dotlrn_term::get_term_info -term_id $term_id -term_name_var "term" -term_year_var "year" set term [dotlrn_term::get_term_name -term_id $term_id] set year [dotlrn_term::get_term_year -term_id $term_id] - set community_key "${class_type}-${term}-${year}" + set community_key "${class_key}-${term}-${year}" set extra_vars [ns_set create] ns_set put $extra_vars term_id $term_id - ns_set put $extra_vars class_key $class_type + ns_set put $extra_vars class_key $class_key ns_set put $extra_vars join_policy $join_policy if {[empty_string_p $pretty_name]} { - set pretty_name "[dotlrn_community::get_community_type_name $class_type]; $term $year" + set pretty_name "[dotlrn_community::get_community_type_name $class_key]; $term $year" } db_transaction { # Create the community set community_id [dotlrn_community::new \ -description $description \ - -community_type $class_type \ + -community_type $class_key \ -object_type [community_type] \ -community_key $community_key \ -pretty_name $pretty_name \ Index: openacs-4/packages/dotlrn/tcl/class-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.xql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn/tcl/class-procs.xql 11 Dec 2001 00:45:15 -0000 1.5 +++ openacs-4/packages/dotlrn/tcl/class-procs.xql 22 Jan 2002 00:13:09 -0000 1.6 @@ -3,9 +3,10 @@ - insert - into dotlrn_classes (class_key) - values (:class_key) + insert into dotlrn_classes + (class_key, department_key) + values + (:class_key, :department_key) @@ -15,7 +16,7 @@ from site_nodes where object_id = (select package_id from dotlrn_classes_full - where class_key = :class_type) + where class_key = :class_key) Index: openacs-4/packages/dotlrn/tcl/department-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/department-procs.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/tcl/department-procs.tcl 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,38 @@ +ad_library { + Procs to manage dotLRN Departments + + @author yon (yon@openforce.net) + @creation-date 2001-01-20 + @version $Id: department-procs.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $ +} + +namespace eval dotlrn_department { + + ad_proc -public new { + {-department_key:required} + {-pretty_name:required} + {-description ""} + {-external_url ""} + } { + Create a new department. + } { + db_transaction { + dotlrn_community::new_type \ + -community_type_key $department_key \ + -parent_type "dotlrn_class_instance" \ + -pretty_name $pretty_name \ + -description $description + + db_dml insert_department {} + } + } + + ad_proc -public select_as_list { + } { + Select all departments as a list of tuples of format: + "pretty_name department_key" + } { + return [db_list_of_lists select_departments {}] + } + +} Index: openacs-4/packages/dotlrn/tcl/department-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/department-procs.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/tcl/department-procs.xql 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,21 @@ + + + + + + insert into dotlrn_departments + (department_key, external_url) + values + (:department_key, :external_url) + + + + + + select pretty_name, + department_key + from dotlrn_departments_full + order by pretty_name + + + Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 15 Jan 2002 20:47:01 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl 22 Jan 2002 00:13:09 -0000 1.11 @@ -12,33 +12,58 @@ form create add_class_instance element create add_class_instance term \ - -label "Term" -datatype integer -widget select -options [db_list_of_lists select_terms_for_select_widget {}] + -label "Term" \ + -datatype integer \ + -widget select \ + -options [db_list_of_lists select_terms_for_select_widget {}] -element create add_class_instance name \ - -label "Name" -datatype text -widget text -html {size 50} -optional +element create add_class_instance pretty_name \ + -label "Name" \ + -datatype text \ + -widget text \ + -html {size 50} \ + -optional element create add_class_instance description \ - -label "Description" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} -optional + -label "Description" \ + -datatype text \ + -widget textarea \ + -html {rows 5 cols 60 wrap soft} \ + -optional element create add_class_instance join_policy \ - -label "Join Policy" -datatype text -widget select -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}} + -label "Join Policy" \ + -datatype text \ + -widget select \ + -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}} element create add_class_instance class_key \ - -label "[ad_parameter classes_pretty_name] Key" -value $class_key -datatype text -widget hidden + -label "[ad_parameter classes_pretty_name] Key" \ + -datatype text \ + -widget hidden \ + -value $class_key -element create add_class_instance referer \ - -label "Referer" -value $referer -datatype text -widget hidden - element create add_class_instance add_instructor \ - -label "Add Instructor" -datatype text -widget radio -options {{Yes 1} {No 0}} -value 1 + -label "Add Instructor" \ + -datatype text \ + -widget radio \ + -options {{Yes 1} {No 0}} \ + -value 1 +element create add_class_instance referer \ + -label "Referer" \ + -datatype text \ + -widget hidden \ + -value $referer + if {[form is_valid add_class_instance]} { - template::form get_values add_class_instance class_key term name description join_policy referer add_instructor + form get_values add_class_instance \ + class_key term pretty_name description join_policy add_instructor referer set class_instance_id [dotlrn_class::new_instance \ - -class_type $class_key \ + -class_key $class_key \ -term_id $term \ - -pretty_name $name \ + -pretty_name $pretty_name \ -description $description \ -join_policy $join_policy \ ] Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/class-new.tcl 15 Jan 2002 20:47:01 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/class-new.tcl 22 Jan 2002 00:13:09 -0000 1.6 @@ -17,22 +17,46 @@ form create add_class +element create add_class department_key \ + -label "[ad_parameter departments_pretty_name]" \ + -datatype text \ + -widget select \ + -options [dotlrn_department::select_as_list] + element create add_class class_key \ - -label "[ad_parameter classes_pretty_name] Key (a short name, no spaces)" -datatype text -widget text -html {size 50} + -label "[ad_parameter classes_pretty_name] Key (a short name, no spaces)" \ + -datatype text \ + -widget text \ + -html {size 60} -element create add_class name \ - -label "Name" -datatype text -widget text -html {size 50} +element create add_class pretty_name \ + -label "Name" \ + -datatype text \ + -widget text \ + -html {size 60} element create add_class description \ - -label "Description" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} + -label "Description" \ + -datatype text \ + -widget textarea \ + -html {rows 5 cols 60 wrap soft} \ + -optional element create add_class referer \ - -label "Referer" -value $referer -datatype text -widget hidden + -label "Referer" \ + -datatype text \ + -widget hidden \ + -value $referer if {[form is_valid add_class]} { - form get_values add_class class_key name description referer + form get_values add_class \ + department_key class_key pretty_name description referer - set class_key [dotlrn_class::new -class_key $class_key -pretty_name $name -description $description] + set class_key [dotlrn_class::new \ + -class_key $class_key \ + -department_key $department_key \ + -pretty_name $pretty_name \ + -description $description] ad_returnredirect $referer ad_script_abort Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 15 Jan 2002 20:47:02 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 22 Jan 2002 00:13:09 -0000 1.6 @@ -17,24 +17,44 @@ form create add_club element create add_club club_key \ - -label "[ad_parameter clubs_pretty_name] Key (a short name, no spaces)" -datatype text -widget text -html {size 50} + -label "[ad_parameter clubs_pretty_name] Key (a short name, no spaces)" \ + -datatype text \ + -widget text \ + -html {size 50} -element create add_club name \ - -label "Name" -datatype text -widget text -html {size 50} +element create add_club pretty_name \ + -label "Name" \ + -datatype text \ + -widget text \ + -html {size 50} element create add_club description \ - -label "Charter" -datatype text -widget textarea -html {rows 5 cols 60 wrap soft} + -label "Charter" \ + -datatype text \ + -widget textarea \ + -html {rows 5 cols 60 wrap soft} element create add_club join_policy \ - -label "Join Policy" -datatype text -widget select -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}} + -label "Join Policy" \ + -datatype text \ + -widget select \ + -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}} element create add_club referer \ - -label "Referer" -value $referer -datatype text -widget hidden + -label "Referer" \ + -datatype text \ + -widget hidden \ + -value $referer if {[form is_valid add_club]} { - form get_values add_club club_key name description join_policy referer + form get_values add_club \ + club_key pretty_name description join_policy referer - set key [dotlrn_club::new -description $description -key $club_key -pretty_name $name -join_policy $join_policy] + set key [dotlrn_club::new \ + -description $description \ + -key $club_key \ + -pretty_name $pretty_name \ + -join_policy $join_policy] ad_returnredirect $referer ad_script_abort Index: openacs-4/packages/dotlrn/www/admin/department-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/department-new.adp 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,5 @@ + +@title@ +@context_bar@ + + Index: openacs-4/packages/dotlrn/www/admin/department-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department-new.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/department-new.tcl 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,65 @@ +ad_page_contract { + create a new department + + @author yon (yon@openforce.net) + @creation-date 2001-01-20 + @version $Id: department-new.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $ +} -query { + {referer "departments"} +} -properties { + title:onevalue + context_bar:onevalue +} + +set title "New [ad_parameter departments_pretty_name]" +set context_bar [list [list departments [ad_parameter departments_pretty_plural]] New] + +form create add_department + +element create add_department department_key \ + -label "[ad_parameter departments_pretty_name] Key (a short name, no spaces)" \ + -datatype text \ + -widget text \ + -html {size 60} + +element create add_department pretty_name \ + -label "Name" \ + -datatype text \ + -widget text \ + -html {size 60} + +element create add_department description \ + -label "Description" \ + -datatype text \ + -widget textarea \ + -html {rows 5 cols 60 wrap soft} \ + -optional + +element create add_department external_url \ + -label "External URL" \ + -datatype text \ + -widget text \ + -html {size 60} \ + -optional + +element create add_department referer \ + -label "Referer" \ + -datatype text \ + -widget hidden \ + -value $referer + +if {[form is_valid add_department]} { + form get_values add_department \ + department_key pretty_name description external_url referer + + set department_key [dotlrn_department::new \ + -department_key $department_key \ + -pretty_name $pretty_name \ + -description $description \ + -external_url $external_url] + + ad_returnredirect $referer + ad_script_abort +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/department.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/department.adp 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1 @@ +@pretty_name@ Index: openacs-4/packages/dotlrn/www/admin/department.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/department.tcl 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,17 @@ +# dotlrn/www/admin/department.tcl + +ad_page_contract { + @author yon (yon@openforce.net) + @creation-date 2002-01-20 + @version $Id: department.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $ +} -query { +} -properties { + department_key:onevalue + pretty_name:onevalue +} + +if {![exists_and_not_null pretty_name]} { + db_1row select_department {} +} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/department.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/department.xql 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,12 @@ + + + + + + select department_key, + pretty_name + from dotlrn_departments_full + where department_key = :department_key + + + Index: openacs-4/packages/dotlrn/www/admin/departments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,20 @@ + +@title@ +@context_bar@ + +[ New <%= [ad_parameter departments_pretty_name] %> ] + +

+ + +
    + +
    • +

    +     +
+ + + +[ New <%= [ad_parameter departments_pretty_name] %> ] + Index: openacs-4/packages/dotlrn/www/admin/departments.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/departments.tcl 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,19 @@ +ad_page_contract { + Displays dotLRN departments admin page + + @author yon (yon@openforce.net) + @creation-date 2002-01-20 + @version $Id: departments.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $ +} -query { +} -properties { + title:onevalue + context_bar:onevalue + departments:multirow +} + +set title "[ad_parameter departments_pretty_plural]" +set context_bar "[ad_parameter departments_pretty_plural]" + +db_multirow departments select_departments {} + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/departments.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/departments.xql 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,11 @@ + + + + + + select department_key, + pretty_name + from dotlrn_departments_full + + + Index: openacs-4/packages/dotlrn/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/index.adp 15 Jan 2002 20:47:02 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/index.adp 22 Jan 2002 00:13:09 -0000 1.10 @@ -11,6 +11,7 @@ Index: openacs-4/packages/dotlrn/www/admin/one-department.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-department.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-department.adp 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,22 @@ + +@pretty_name@ +@context_bar@ + +

+ @external_url@ +

+ +

+ @description@ +

+ +

+ + +<% [ad_parameter classes_pretty_plural] %> + + Index: openacs-4/packages/dotlrn/www/admin/one-department.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-department.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-department.tcl 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,27 @@ +ad_page_contract { + Displays single dotLRN class page + + @author Ben Adida (ben@openforce.net) + @author yon (yon@openforce.net) + @creation-date 2001-11-07 + @version $Id: one-department.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $ +} -query { + department_key:notnull +} -properties { + pretty_name:onevalue + external_url:onevalue + description:onevalue + classes:multirow +} + +# Get information about that class +if {![db_0or1row select_departments_info {}]} { + ad_returnredirect "departments" + ad_script_abort +} + +db_multirow classes select_classes {} + +set context_bar [list [list departments [ad_parameter departments_pretty_plural]] One] + +ad_return_template Index: openacs-4/packages/dotlrn/www/admin/one-department.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-department.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn/www/admin/one-department.xql 22 Jan 2002 00:13:09 -0000 1.1 @@ -0,0 +1,21 @@ + + + + + + select pretty_name, + description, + external_url + from dotlrn_departments_full + where department_key = :department_key + + + + + + select * + from dotlrn_classes_full + where department_key = :department_key + + + Index: openacs-4/packages/dotlrn/www/admin/term-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/term-new.tcl 10 Jan 2002 19:30:18 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/term-new.tcl 22 Jan 2002 00:13:09 -0000 1.3 @@ -13,24 +13,44 @@ form create add_term element create add_term term_name \ - -label "Term (e.g. Spring, Fall)" -datatype text -widget text -html {size 30} + -label "Term (e.g. Spring, Fall)" \ + -datatype text \ + -widget text \ + -html {size 30} element create add_term term_year \ - -label "Year" -datatype text -widget text -html {size 4} + -label "Year" \ + -datatype text \ + -widget text \ + -html {size 5 maxsize 4} element create add_term start_date \ - -label "Start Date" -datatype date -widget date -format {MONTH DD YYYY} + -label "Start Date" \ + -datatype date \ + -widget date \ + -format {MONTH DD YYYY} element create add_term end_date \ - -label "End Date" -datatype date -widget date -format {MONTH DD YYYY} + -label "End Date" \ + -datatype date \ + -widget date \ + -format {MONTH DD YYYY} element create add_term referer \ - -label "Referer" -value $referer -datatype text -widget hidden + -label "Referer" \ + -datatype text \ + -widget hidden \ + -value $referer if {[form is_valid add_term]} { - form get_values add_term term_name term_year start_date end_date referer + form get_values add_term \ + term_name term_year start_date end_date referer - dotlrn_term::new -term_name $term_name -term_year $term_year -start_date $start_date -end_date $end_date + dotlrn_term::new \ + -term_name $term_name \ + -term_year $term_year \ + -start_date $start_date \ + -end_date $end_date ad_returnredirect $referer ad_script_abort