From raeburn at source.lon-capa.org Tue Jan 12 10:52:06 2021 From: raeburn at source.lon-capa.org (raeburn) Date: Tue, 12 Jan 2021 15:52:06 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /homework response.pm Message-ID: raeburn Tue Jan 12 15:52:06 2021 EDT Modified files: /loncom/homework response.pm Log: - If questiontype in effect is one of the four survey types, and award on submission for a customresponse item is 'ASSIGNED_SCORE', change that to one of: SUBMITTED, SUBMITTED_CREDIT, ANONYMOUS or ANONYMOUS_CREDIT, as appropriate. Index: loncom/homework/response.pm diff -u loncom/homework/response.pm:1.247 loncom/homework/response.pm:1.248 --- loncom/homework/response.pm:1.247 Sun Aug 11 12:27:11 2019 +++ loncom/homework/response.pm Tue Jan 12 15:52:06 2021 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.247 2019/08/11 12:27:11 raeburn Exp $ +# $Id: response.pm,v 1.248 2021/01/12 15:52:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -473,8 +473,8 @@ $error = $award; $award = 'ERROR'; } - if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || - $award eq 'EXACT_ANS')) { + if (($award eq 'INCORRECT') || ($award eq 'APPROX_ANS') || + ($award eq 'EXACT_ANS') || ($award eq 'ASSIGNED_SCORE')) { if ($Apache::lonhomework::type eq 'survey') { $award='SUBMITTED'; } elsif ($Apache::lonhomework::type eq 'surveycred') { From raeburn at source.lon-capa.org Tue Jan 12 10:57:18 2021 From: raeburn at source.lon-capa.org (raeburn) Date: Tue, 12 Jan 2021 15:57:18 -0000 Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework response.pm Message-ID: raeburn Tue Jan 12 15:57:18 2021 EDT Modified files: (Branch: version_2_11_X) /loncom/homework response.pm Log: - For 2.11 Backport 1.248 Index: loncom/homework/response.pm diff -u loncom/homework/response.pm:1.244.2.2 loncom/homework/response.pm:1.244.2.3 --- loncom/homework/response.pm:1.244.2.2 Wed Oct 23 22:35:22 2019 +++ loncom/homework/response.pm Tue Jan 12 15:57:18 2021 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.244.2.2 2019/10/23 22:35:22 raeburn Exp $ +# $Id: response.pm,v 1.244.2.3 2021/01/12 15:57:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -468,8 +468,8 @@ $error = $award; $award = 'ERROR'; } - if (($award eq 'INCORRECT' || $award eq 'APPROX_ANS' || - $award eq 'EXACT_ANS')) { + if (($award eq 'INCORRECT') || ($award eq 'APPROX_ANS') || + ($award eq 'EXACT_ANS') || ($award eq 'ASSIGNED_SCORE')) { if ($Apache::lonhomework::type eq 'survey') { $award='SUBMITTED'; } elsif ($Apache::lonhomework::type eq 'surveycred') { From raeburn at source.lon-capa.org Sat Jan 16 20:58:56 2021 From: raeburn at source.lon-capa.org (raeburn) Date: Sun, 17 Jan 2021 01:58:56 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm Message-ID: raeburn Sun Jan 17 01:58:56 2021 EDT Modified files: /loncom/lonnet/perl lonnet.pm Log: - Typo Index: loncom/lonnet/perl/lonnet.pm diff -u loncom/lonnet/perl/lonnet.pm:1.1437 loncom/lonnet/perl/lonnet.pm:1.1438 --- loncom/lonnet/perl/lonnet.pm:1.1437 Tue Jan 5 04:23:46 2021 +++ loncom/lonnet/perl/lonnet.pm Sun Jan 17 01:58:56 2021 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1437 2021/01/05 04:23:46 raeburn Exp $ +# $Id: lonnet.pm,v 1.1438 2021/01/17 01:58:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -14332,7 +14332,7 @@ ipheader => $domdefaults{'waf_ipheader'}, trusted => $domdefaults{'waf_trusted'}, vpnint => $domdefaults{'waf_vpnint'}, - vpnext => $domdefaults{'waf_vpnext'}; + vpnext => $domdefaults{'waf_vpnext'}, }; return $proxyinfo; } From raeburn at source.lon-capa.org Sun Jan 17 13:23:09 2021 From: raeburn at source.lon-capa.org (raeburn) Date: Sun, 17 Jan 2021 18:23:09 -0000 Subject: [LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm Message-ID: raeburn Sun Jan 17 18:23:09 2021 EDT Modified files: /loncom/interface lonparmset.pm Log: - Management of availablestudent parameter by a CC is via Settings > Slots. Setting of availablestudent parameter is by student via Reservations or using Select/Drop/Change Reservation buttons for a resource itself. Index: loncom/interface/lonparmset.pm diff -u loncom/interface/lonparmset.pm:1.598 loncom/interface/lonparmset.pm:1.599 --- loncom/interface/lonparmset.pm:1.598 Thu Dec 24 00:37:30 2020 +++ loncom/interface/lonparmset.pm Sun Jan 17 18:23:09 2021 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.598 2020/12/24 00:37:30 raeburn Exp $ +# $Id: lonparmset.pm,v 1.599 2021/01/17 18:23:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1912,9 +1912,7 @@ $nolink = 1; } } elsif ($mprefix =~ /availablestudent\&$/) { - if ($which > 4) { - $nolink = 1; - } + $nolink = 1; } elsif ($mprefix =~ /examcode\&$/) { unless ($which == 2) { $nolink = 1; @@ -4680,6 +4678,7 @@ ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/); my $section=&mt('All Students'); $readonly = $readonlyall; + my $userscope; my $showval = $$resourcedata{$thiskey}; if ($middle=~/^\[(.*)\]/) { my $issection=$1; @@ -4693,6 +4692,7 @@ } } $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom); + $userscope = 1; } else { if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) { if (exists($grouphash{$issection})) { @@ -4790,8 +4790,13 @@ ''.&mt($parmitem). ''); unless ($readonly) { + my $disabled; + if (($name eq 'availablestudent') && + (($showval eq '') || ($userscope))) { + $disabled = ' disabled="disabled"'; + } $r->print(''); + $thiskey.'"'.$disabled.' />'); } $r->print(''); $foundkeys++; @@ -4819,6 +4824,9 @@ $r->print(&date_interval_selector($thiskey,$name, $showval,$readonly)); } elsif ($thistype =~ m/^string/) { + if ($name eq 'availablestudent') { + $readonly = 1; + } $r->print(&string_selector($thistype,$thiskey, $showval,$name,$readonly)); } else { From raeburn at source.lon-capa.org Sun Jan 17 17:19:51 2021 From: raeburn at source.lon-capa.org (raeburn) Date: Sun, 17 Jan 2021 22:19:51 -0000 Subject: [LON-CAPA-cvs] cvs: doc /help course.manual.texxml /loncapafiles loncapafiles.lpml loncom/html/adm/help/png slots_change_confirm.png slots_change_resv.png slots_creation.png slots_instructor_assigned.png slots_manager.png slots_navmaps.png slots_params.png slots_proctor_validate.png slots_student_reserve.png slots_summary_cc.png slots_timeline.png slots_uniqueness.png loncom/html/adm/help/tex Slot_CommaDelimited.tex Slot_Use.tex Message-ID: raeburn Sun Jan 17 22:19:51 2021 EDT Added files: /loncom/html/adm/help/png slots_creation.png slots_manager.png slots_instructor_assigned.png slots_params.png slots_summary_cc.png slots_timeline.png slots_uniqueness.png slots_proctor_validate.png slots_navmaps.png slots_student_reserve.png slots_change_resv.png slots_change_confirm.png /loncom/html/adm/help/tex Slot_Use.tex Modified files: /loncom/html/adm/help/tex Slot_CommaDelimited.tex /doc/loncapafiles loncapafiles.lpml /doc/help course.manual.texxml Log: - Document use of slots to support reservation by students (in advance) to content at a particular time and/or place. - Expand information about formatting in slot attributes CSV file. -------------- next part -------------- Index: loncom/html/adm/help/tex/Slot_CommaDelimited.tex diff -u loncom/html/adm/help/tex/Slot_CommaDelimited.tex:1.3 loncom/html/adm/help/tex/Slot_CommaDelimited.tex:1.4 --- loncom/html/adm/help/tex/Slot_CommaDelimited.tex:1.3 Mon Jan 16 23:16:39 2017 +++ loncom/html/adm/help/tex/Slot_CommaDelimited.tex Sun Jan 17 22:19:50 2021 @@ -1,8 +1,8 @@ - \label{Slot_CommaDelimited} +\label{Slot_CommaDelimited} - Another way of entering slot information is by uploading a comma separated (CSV) file. An easy way to create this type of file is to use a spreadsheet application such as Microsoft Excel, and save the file as a comma separated value (CSV) file. +If you will be creating several slots you may prefer to create them by uploading a comma separated value (CSV) file containing slot configuration information with one line of data per slot. An easy way to create this type of file is to use a spreadsheet application such as Microsoft Excel, and save the file as a Text (CSV) file. If you use a text editor directly to create the file, you should use double quotes around any values which themselves contain a comma (e.g., lit of proctor ids). - To upload a file press the \textbf{Upload Slot List} button on top of the page. On the first page, select the file with the slot data to upload by pressing the \textbf{Browse button}. There is an option to ignore the first line. This is useful when the first line of your comma delimited file consists of headers for each field. You can also upload space and tab delimited file by changing the type combo box. Press \textbf{Upload} to upload the file. +To upload a file press the \textbf{Upload Slot List} button on top of the page. On the first page, select the file with the slot data to upload by pressing the \textbf{Browse button}. There is an option to ignore the first line. This is useful when the first line of your comma delimited file consists of headers for each field. You can also upload space and tab delimited file by changing the type combo box. Press \textbf{Upload} to upload the file. Once uploaded, you will be prompted to identify the contents of each column in your CSV data. The following fields are supported: \begin{itemize} @@ -25,9 +25,32 @@ \item Users slot is restricted to \end{itemize} -The following fields: ``Slot name'', ``Type of slot'', ``Start Time of slot'' and ``End Time of slot'' are required. +\\The following fields: ``Slot name'', ``Type of slot'', ``Start Time of slot'' and ``End Time of slot'' are required.\\ -A Slot name may only contain letters, numbers and underscores. -The Type of slot must be either preassigned or schedulable\_student. -The four Time fields: Start Time, End Time, Reservation Start Time, Reservation End Time permit a variety of formats. -For example, the following formats are permitted: `YYYYMMDDHHMMSS'' and ``MM/DD/YYYY HH:MM:SS'' +\\Format restrictions for the required fields are as follows: +\begin{itemize} +\item A Slot name may only contain letters, numbers and underscores. +\item The Type of slot must be either preassigned or schedulable\_student. +\item The four Time fields: Start Time, End Time, Reservation Start Time, Reservation End Time permit a variety of formats (for example: YYYYMMDDHHMMSS and MM/DD/YYYY HH:MM:SS) +\end{itemize} +End Time must be later than Start time. If no Reservation Start Time is specified, the slot can be reserved after the open date. If no Reservation End Time is specified, the slot can be reserved up until the slot start time.\\ + +\\Format requirements for the optional fields are as follows: +\begin{itemize} +\item ``Message when reservation changed'' can be: only_student, student_and_user_notes_screen or none. +\item ``IP or DNS restriction'' is a comma-separated list. If a particular IP restriction is: deny access from, prepend ! to the item. Individual IP/DNS items can have one of the following formats: +\begin{enumerate} +\item a range, e.g, 35.8.3.[34-56] +\item partial IP with wildcard, e.g., 35.8.* +\item domain or subnet: e.g., *.msu.edu +\item single IP: e.g., 127.0.0.1 +\item single DNS name, e.g., some.name.com +\end{enumerate} +\item ``Unique IP each student'' can be yes +\item ``List of proctor ids'' is a comma separated list of username:domain for users who will proctor. +\item ``Maximum number of reservations'' is a positive integer +\item ``Resource(s)/Map(s) Restriction'' is a comma separated list of unique resource identifiers (aka `symbs'). If the symb is for a map (i.e., .sequence or .page) then all resources in that map may use the slot. +\item ``Date range of slot exclusion'' contains two dates separated by a comma. The second date/time must post-date the first date/time. Permitted formats for each date/time are the same as for the four time fields. +\item ``Sections slot is restricted to'' is a comma separated list of course sections +\item ``Users slot is restricted to'' is a comma separated list of users (each user is in the format username:domain) +\end{itemize} Index: doc/loncapafiles/loncapafiles.lpml diff -u doc/loncapafiles/loncapafiles.lpml:1.1009 doc/loncapafiles/loncapafiles.lpml:1.1010 --- doc/loncapafiles/loncapafiles.lpml:1.1009 Sun Jan 3 17:31:53 2021 +++ doc/loncapafiles/loncapafiles.lpml Sun Jan 17 22:19:50 2021 @@ -2,7 +2,7 @@ "http://lpml.sourceforge.net/DTD/lpml.dtd"> - + - +