Subversion Repositories wimsdev

Rev

Rev 17094 | Rev 17154 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 17094 Rev 17153
Line 73... Line 73...
73 
!! ------ time for each zone
 73 
!! ------ time for each zone
74 
utime=$class_utime
 74 
utime=$class_utime
75 
!default utime=15
 75 
!default utime=15
76 
 
 76 
 
77 
!! make data for the student
 77 
!! make data for the student
78 
!reset data,lt_month
 78 
!reset data,lt_month,ldata
- 
 
 79 
mcol=1
- 
 
 80 
yy=!char 3 to 4 of $date
79 
!while $date<$enddate
 81 
!while $date<$enddate
80 
  !increase wcount
 82 
  !increase wcount
81 
  !if $wcount=1
 - 
 
82 
    lt_month=!append line $wnum,$mois to $lt_month
- 
 
83 
  !endif
 - 
 
84 
  !reset ligne
 83 
  !reset ligne
85 
  !for k=1 to 7
 84 
  !for k=1 to 7
86 
    !ifval $k=$dnum and $date<$enddate
 85 
    !ifval $k=$dnum and $date<$enddate
87 
      !if $(activity[1])=$date
 86 
      !if $(activity[1])=$date
88 
        col=$[min(ceil($(activity[2])/$utime),4)+1]
 87 
        col=$[min(ceil($(activity[2])/$utime),4)+1]
- 
 
 88 
        mcol=$[max($mcol,$col)]
89 
        ligne=!append item $col $date $(activity[2]) to $ligne
 89 
        ligne=!append item $col $date $(activity[2]) to $ligne
90 
        !increase cpta
 90 
        !increase cpta
91 
        !if $cpta<=$nbactivity
 91 
        !if $cpta<=$nbactivity
92 
          activity=!record $cpta of wimshome/sessions/$wims_session/$user.st
 92 
          activity=!record $cpta of wimshome/sessions/$wims_session/$user.st
93 
        !endif
 93 
        !endif
Line 102... Line 102...
102 
      !else
 102 
      !else
103 
        !increase dnum
 103 
        !increase dnum
104 
      !endif
 104 
      !endif
105 
      !ifval $month!=$mois
 105 
      !ifval $month!=$mois
106 
        wcount=0
 106 
        wcount=0
- 
 
 107 
        !if $mcol>1
- 
 
 108 
          lt_month=!append line $wnum,$mois,$yy to $lt_month
- 
 
 109 
          dataflag=1
- 
 
 110 
          mcol=1
- 
 
 111 
        !endif
107 
        mois=$month
 112 
        mois=$month
- 
 
 113 
        yy=!char 3 to 4 of $date
108 
        !readproc adm/calendar.proc endmonth $date
 114 
        !readproc adm/calendar.proc endmonth $date
109 
        wnum=$[ceil(($output-(7-$dnum+1))/7)+1]
 115 
        wnum=$[ceil(($output-(7-$dnum+1))/7)+1]
110 
        !if $dnum!=1
 116 
        !if $dnum!=1
111 
          flag=$dnum
 117 
          flag=$dnum
112 
          !reset dnum
 118 
          !reset dnum
Line 118... Line 124...
118 
        dnum=$flag
 124 
        dnum=$flag
119 
        !reset flag
 125 
        !reset flag
120 
      !endif
 126 
      !endif
121 
    !endif
 127 
    !endif
122 
  !next k
 128 
  !next k
123 
  data=!append line $ligne to $data
 129 
  ldata=!append line $ligne to $ldata
- 
 
 130 
  !if $wcount=0
- 
 
 131 
    !if $dataflag=1
- 
 
 132 
      data=!append line $ldata to $data
- 
 
 133 
      !reset ldata dataflag
- 
 
 134 
    !else
- 
 
 135 
      !reset ldata
- 
 
 136 
    !endif
- 
 
 137 
  !endif
124 
!endwhile
 138 
!endwhile
125 
nb_dtl=!linecnt $data
 139 
nb_dtl=!linecnt $data
- 
 
 140 
 
- 
 
 141 
!!debug $lt_month\
- 
 
 142 
!!\
- 
 
 143 
!!$nb_dtl\
- 
 
 144 
!!\
- 
 
 145 
!!$data