WebSVN – wimsdev – Diff – /trunk/wims/public_html/modules/adm/class/userscore/csv/upload.proc

   !next u
   !writefile $fn :$first
   cnt=!recordcnt $fu
   list_user=$empty
   joker=--
+  tmp1=!replace internal up_manual by in $types
+  tmp2=!replace internal o_ by in $otypes
+  list_mod=!listintersect $tmp1 and $tmp2
-  !for i=1 to $cnt
+  !for ii=1 to $cnt
-    l_=!record $i of $fu
+    l_=!record $ii of $fu
     u=!item 3 of $l_
     list_user=!append item $u to $list_user
     !distribute items $(dep_$u) into $types
     !distribute items $(orig_$u) into $otypes
     t_=!defof user_firstname user_lastname in wimshome/$userdir/$u
     !for i=1 to $n
+      !if $i isitemof $list_mod
+        !if $(up_manual$i)=$empty
+          l_=!item $i+1 of $(orig_$u)
+        !else
-      l_=$[$(up_manual$i)]
+          l_=$[$(up_manual$i)]
+        !endif
-      !if NaN isin $l_ or Inf isin $l_ or $l_<0 or $l_>100000 or $(up_manual$i)=$empty
+        !if NaN isin $l_ or Inf isin $l_ or $l_<0 or $l_>100000 or $l_=$empty
-        l_=$joker
+          l_=$joker
+        !endif
+      !else
+        l_=!item $i+1 of $(orig_$u)
       !endif
       !default l_=$(o_$i)
       !default l_=$joker
       t_=!append item $l_ to $t_
     !next i
     t_=!replace internal $joker by $empty in $t_
     !appendfile $fn :$u,$t_
-  !next u
+  !next ii
   list_deleted=!listcomplement $list_user in $list_grades
   !if $list_deleted!=$empty
     nbdel=!itemcnt $list_deleted
     !for k=1 to $nbdel
       !appendfile $fn :$(list_deleted[$k]),$(orig_$(list_deleted[$k]))

Subversion Repositories wimsdev