- Timestamp:
- 02/21/11 18:29:34 (15 months ago)
- Location:
- trunk/htdocs/central/dataentry
- Files:
-
- 4 modified
-
actualizarregistro.php (modified) (4 diffs)
-
js/campos.js (modified) (1 diff)
-
js/editarocurrencias.js (modified) (12 diffs)
-
js/terminoseleccionado.js (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/htdocs/central/dataentry/actualizarregistro.php
r1148 r1195 77 77 $t=explode('|',$fdt); 78 78 $tag=$t[1]; 79 $dataentry=$t[7]; 79 80 if (isset($variables["tag".$tag])){ 80 81 $rep=$t[4]; 81 82 $tipoc=$t[0]; 82 $dataentry=$t[7];83 83 84 84 if ($dataentry=="A") { 85 85 $variables["tag".$tag]=str_replace("\n","", $variables["tag".$tag]); 86 86 $variables["tag".$tag]=str_replace("\r","", $variables["tag".$tag]); 87 $variables["tag".$tag]=substr($variables["tag".$tag],0,16360); 87 $variables["tag".$tag]=substr($variables["tag".$tag],0,16360); //Esto es provisional porque es el largo m�mo que actualiza 88 88 } 89 89 $subc=rtrim($t[5]); … … 134 134 $variables["tag".$tag]= $salida; 135 135 } 136 }else{ 137 if ($dataentry!="B") $variables["tag".$tag]=""; //THE EXTERNAL HTML IS NOT UPDATED 136 138 } 137 139 } … … 215 217 } 216 218 } 217 //echo "<xmp>$ValorCapturado</xmp>"; 218 //die; 219 #echo "<xmp>$ValorCapturado</xmp>"; 220 #die; 221 #echo strlen($ValorCapturado); 219 222 220 223 $ValorCapturado=urlencode($ValorCapturado); … … 272 275 die; 273 276 }else{ 274 echo $output;277 if (isset($output))echo $output; 275 278 } 276 279 $IsisScript=$xWxis."actualizar.xis"; -
trunk/htdocs/central/dataentry/js/campos.js
r1169 r1195 89 89 base=top.base 90 90 // msgwin=window.open("campos.php?wks="+Wks+"&tag="+TagCampo+"&base="+base,"Window1" ,"status=yes,resizable=yes,toolbar=false,menu=no,scrollbars=yes,,height=500,top=50,left=0") 91 msgwin=window.open("campos.php?tag="+TagCampo+"&base="+base+wks ,"Window1" ,"status=yes,resizable=yes,toolbar=false,menu=no,scrollbars=yes,,height=500,top=50,left=0")91 msgwin=window.open("campos.php?tag="+TagCampo+"&base="+base+wks+"&is_marc="+is_marc,"Window1" ,"status=yes,resizable=yes,toolbar=false,menu=no,scrollbars=yes,,height=500,top=50,left=0") 92 92 msgwin.focus() 93 93 -
trunk/htdocs/central/dataentry/js/editarocurrencias.js
r1169 r1195 89 89 // si no hay indicadores pero el campo los debe tener se abren las dos casillas en blanco 90 90 inctr="" 91 if (xsalida=="" ){91 if (xsalida=="" || xsalida=="^-"){ 92 92 for (i=0;i<Tx[5].length;i++){ 93 93 sc=Tx[5].substr(i,1) … … 95 95 } 96 96 }else{ 97 if (Tx[5].substr(0,1)==1 ){97 if (Tx[5].substr(0,1)==1 && is_marc=="S"){ 98 98 ixpos=xsalida.indexOf("^") 99 99 if (ixpos!=2) … … 115 115 for (i=0;i<Tx[5].length;i++){ 116 116 xd=SubCampos[i].split('|') 117 if ((xd[5]==1 || xd[5]==2) && i<2 ){117 if ((xd[5]==1 || xd[5]==2) && i<2 && is_marc=="S"){ 118 118 ix="I"+xd[5] //ADD THE LETTER I TO THE INDICATOR CODE FOR NOT CONFUSING WITH SUBFIELD 2 119 119 Desc_sc[ix]=xd[2] … … 124 124 sc_ant="" 125 125 len=campos.length 126 126 for (i=1;i<len;i++){ 127 127 new_subc=campos[i].substr(0,1) 128 list_subc=Tx[5].substr(i-1,1) 128 129 pick="" 129 130 for (j=0;j<Tx[5].length;j++){ … … 131 132 tipoe=sc[7] 132 133 Ind="" 133 if (i<3 && (sc[5]==1 || sc[5]==2) )134 if (i<3 && (sc[5]==1 || sc[5]==2) && is_marc=="S") 134 135 Ind="I" 135 136 if (sc[5]==new_subc){ … … 148 149 strsubc+=new_subc 149 150 lista_sc[M]="t"+C_Sc+"_"+M 150 ixsc=Tx[5].indexOf( new_subc)151 152 if (i >2 || C_Sc!=1 && C_Sc!=2){151 ixsc=Tx[5].indexOf(list_subc) 152 153 if (is_marc!="S" || i>2 || (C_Sc!=1 && C_Sc!=2)){ 153 154 if (C_Sc!="-"){ 154 155 if (sc_ant!="-"){ … … 179 180 //GET THE SUBFIELD NAME 180 181 ixnamec=Tx[5].indexOf(C_Sc) 181 if ( (C_Sc==1 || C_Sc==2) && i<3){182 if (is_marc=="S" && (C_Sc==1 || C_Sc==2) && i<3 ){ 182 183 NombreSc=Desc_sc["I"+C_Sc] //GET THE NAME OF THE INDICATOR 183 184 }else{ 184 185 NombreSc=Desc_sc[C_Sc] //GET THE NAME OF THE SUBFIELD 185 186 } 186 html+="<td valign=top>"+ NombreSc+"</a></td>"187 html+="<td valign=top>"+C_Sc+" "+NombreSc+"</a></td>" 187 188 html+="<td class=td nowrap>" 188 189 xsize="70" 189 if (i <3 && (C_Sc==1 || C_Sc==2)){190 if (is_marc=="S" && i<3 && (C_Sc==1 || C_Sc==2)){ 190 191 xsize="1 maxlength=1" 191 192 } … … 208 209 } 209 210 210 if (i >2 || C_Sc!=1 && C_Sc!=2){211 if (is_marc!="S" || (i>2 || C_Sc!=1 && C_Sc!=2 && is_marc=="S")){ 211 212 html+="<select name=agregar id=at"+C_Sc+"_"+M+" onChange=AgregarSubcampo(this,"+j+") style=width:100px>" 212 213 html+="<option value=''>add" … … 273 274 for (i=0;i<lista_sc.length;i++){ 274 275 subc=lista_sc[i].substr(1,1) 275 if ((i==0 || i==1 ) & (subc==1 || subc==2) ){276 if ((i==0 || i==1 ) & (subc==1 || subc==2) && is_marc=="S"){ 276 277 xsalida+=valores[i] 277 278 }else{ … … 303 304 for (i=0;i<lista_sc.length;i++){ 304 305 subc=lista_sc[i].substr(1,1) 305 if ((i==0 || i==1 ) & (subc==1 || subc==2) ){306 if ((i==0 || i==1 ) & (subc==1 || subc==2) && is_marc=="S"){ 306 307 xsalida+=valores[i] 307 308 }else{ … … 319 320 ctrl= returnObjById(ins) 320 321 if (Trim(ctrl.value)=="") { 321 subc.selectedIndex=0 322 ins=-1 323 return 322 if (ins.substr(1,1)!="-"){ //if the subfield is optional can be empty 323 subc.selectedIndex=0 324 ins=-1 325 return 326 } 324 327 } 325 328 salida="" … … 338 341 salida+="^"+subc_act+valor 339 342 }else{ 340 if ((ixsc==0 || ixsc==1) && (subc_act=="1" || subc_act=="2") ){343 if ((ixsc==0 || ixsc==1) && (subc_act=="1" || subc_act=="2") && is_marc=="S"){ 341 344 salida+=valor 342 345 }else( -
trunk/htdocs/central/dataentry/js/terminoseleccionado.js
r1169 r1195 82 82 subc_act=nombre.substr(1,1) 83 83 valor=document.forma1.elements[i].value 84 if ( m<2 && (subc_act==1 || subc_act==2)){84 if (is_marc=="S" && m<2 && (subc_act==1 || subc_act==2)){ 85 85 if (Trim(valor)=="") valor=" " 86 86 seleccion+=valor … … 107 107 valor=document.forma1.elements[i].options[document.forma1.elements[i].selectedIndex].value 108 108 document.forma1.elements[i].selectedIndex=-1 109 if ( m<2 && (subc_act==1 || subc_act==2)){109 if (is_marc=="S" && m<2 && (subc_act==1 || subc_act==2)){ 110 110 if (Trim(valor)=="") valor=" " 111 111 seleccion+=valor … … 173 173 if (j!=-1) { 174 174 seleccion=(document.forma1.lista.options[j].value) 175 if (xxs[5]=='-' ) seleccion="^-"+seleccion175 if (xxs[5]=='-' && seleccion!="") seleccion="^-"+seleccion 176 176 }else{ 177 177 seleccion=""
