Changeset 16559

Timestamp:

06/01/13 16:03:27 (12 years ago)

Author:

tose

Message:

 

File:

• schedule/Module/calendar.php (modified) (3 diffs)

schedule/Module/calendar.php

@@ -105 +105 @@
                                 function getXML() 
                                 {
-                    if (window.XMLHttpRequest)
-                                                 {// code for IE7+, Firefox, Chrome, Opera, Safari
-                         xmlhttp.push(new XMLHttpRequest());
-                                                 }
-                                        else
-                                                 {// code for IE6, IE5
-                         alert("new other request created");
-                                                 xmlhttp.push(new ActiveXObject("Microsoft.XMLHTTP"));
-                                                 }
-
+                    xmlhttp.push(new XMLHttpRequest());
                                         index = xmlhttp.length - 1;
-                                        $('#data').append('XML request is in the array! ');
-                                        //document.getElementById('data').innerHTML="XML request is in the array! ";
-
-                                }
+                }
 
                                 function getXMLData()
                                 {
                                         getXML();
-                    xmlhttp[index].onreadystatechange=xmlStateChange();
-                                        $('#data').append('XML data were taken');
-                                        //document.getElementById('data').innerHTML="XML data were taken! ";
-
-                                        xmlhttp[index].open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[index])+"&time="+year+"-"+month+"-"+day,true);
+                    xmlhttp[index].onload=xmlStateChange();
+                                
+                                        xmlhttp[index].open("GET","/smartfact/index.php?source="+escape(source[index])+"&time="+year+"-"+month+"-"+day,true);
                                         xmlhttp[index].send();
                                 }
@@ -134 +120 @@
                                 function xmlStateChange()
                                 {
-                                        $('#data').append('XML state is activated!');
-                    alert(index+" "+xmlhttp[index].readyState+" "+xmlhttp[index].status + " " + xmlhttp[index].statusText);
-                                         if (xmlhttp[0].readyState==4 && xmlhttp[0].status==200)
+                     alert(index+" "+xmlhttp[index].readyState+" "+xmlhttp[index].status + " " + xmlhttp[index].statusText);
+                                         if (xmlhttp[index].readyState==4 && xmlhttp[index].status==200)
                                                 {
                                                 //sourceData[index]= new Array(); //--> remove this if you use sourceData[[]]
                                                 line=xmlhttp[index].responseText.split('\n');
-                                                $('#data').append('XML value has changed!');
-                                                //document.getElementById('data').innerHTML="XML value has changed!";
-                                                document.getElementById('data').innerHTML=xmlhttp[index].responseText;
-
                                                         for(row=0;row<line.length;row++)
                                                         {
-                                                        $('#data').append('XML data was looped!');
                                                         rows=line[row].split(',');
                                                         sourceData[index].push(rows[4]);
                                                         }
-                                                        document.getElementById('data').innerHTML=line;
                                                 }
-                                                else
-                                                        $('#data').append('xmlhttp status undefined');
-                                                        
                                 }
 
@@ -193 +169 @@
                                                         year =this.selection.print("%Y").join("\n");    
                                                         //document.getElementById('data').innerHTML="Calendar selected! ";
-                                                        $('#data').append('XML data were taken');
-                        
+                                                                               
                         alert ("event here");
-                        testData();
-                                                //displayData();
-                                                /*for (i=0; i<source.length; i++)
-                                        {
-                                        getXMLData();
-                                        //display source data here sourceData[i]
-                                        //document.getElementById('data').innerHTML=sourceData[i];
-                                        }       */
-                                        
-                                                });
+                        //testData();
+                                                for (i=0; i<source.length; i++)
+                        {
+                        getXMLData();
+                        document.getElementById('data').innerHTML=sourceData[i];
+                        }       
+                });