changed log table to chart. Added status P(=Pause).

[opengatem/opengatem.git] / mngsrc / cgi.c

diff --git a/mngsrc/cgi.c b/mngsrc/cgi.c
index 330f936..8bff273 100644 (file)
--- a/mngsrc/cgi.c
+++ b/mngsrc/cgi.c
@@ -1063,6 +1063,7 @@ int putUpdatePageToClient(char *language, char* userId, char* extraId, int ownUp
   }
 
   while(fgets(buff,BUFFMAXLN,fp)!=NULL){
+
     HtmlReplace(buff, "%%CGINAME%%", updateCgi);
     HtmlReplace(buff, "%%USERID%%", userId);
     HtmlReplace(buff, "%%REDIRECTEDURL%%", redirectedUrl);
@@ -1101,7 +1102,7 @@ void putMacListToClient(char* userId, char* extraId){
   while(GetNextMacAddrFromMngDb(userId,extraId,macAddr,deviceName,
                                entryDate,limitDate,status,mailAddress)){
     printf("<tr align=middle>\n");
-    if(status[0]=='A'){
+    if((status[0]=='A')||(status[0]=='P')){
       printf("<td><input type=radio name=%s value=extend checked></td>\n",macAddr);
       printf("<td><input type=radio name=%s value=pause></td>\n",macAddr);
       printf("<td><input type=radio name=%s value=delete></td>\n",macAddr);
@@ -1124,30 +1125,45 @@ void putMacListToClient(char* userId, char* extraId){
 /*********************************************/
 void putUsageLogToClient(char *userId, char* extraId, char* language){
 
-  char macAddr[ADDRMAXLN];
-  char deviceName[WORDMAXLN];
-  char openTime[WORDMAXLN];
-  char gatewayName[WORDMAXLN];
-  int weekday;
-  char str[WORDMAXLN];
+  char macAddr[ADDRMAXLN]="";
+  char deviceName[WORDMAXLN]="";
+  char openTime[WORDMAXLN]="";
+  char closeTime[WORDMAXLN]="";
+  char gatewayName[WORDMAXLN]="";
+  char beginTime[WORDMAXLN]="";
+  char endTime[WORDMAXLN]="";
+  int dateCount=0;
   char* p;
+  int count=0;
 
-  /* get usage log form db and insert as html table row */
+  /* get usage log from db and insert as JSON format */
   while(GetNextUsageLogFromMngDb(userId,extraId,macAddr,deviceName,
-                                openTime,gatewayName,&weekday)){
+                                openTime,closeTime,gatewayName)){
 
     /* split hostname only */
     if((p=strchr(gatewayName,'.'))!=NULL) *p='\0';
 
     /* put out table row */
-    printf("<tr align=middle>\n");
-    printf("<td>%s</td>\n", macAddr);
-    printf("<td>%s</td>\n",deviceName);
-    printf("<td>%s</td>\n",openTime);
-    printf("<td>%s</td>\n",WeekdayStr(weekday, str, language));
-    printf("<td>%s</td>\n",gatewayName);
-    printf("</tr>\n");
+    printf("\t %d:{\n", count);
+    printf("\t\t macAddress: '%s',\n", macAddr);
+    printf("\t\t device: '%s',\n",deviceName);
+    printf("\t\t openTime: '%s',\n",openTime);
+    printf("\t\t closeTime: '%s',\n",closeTime);
+    printf("\t\t gateway: '%s'\n",gatewayName);
+    printf("\t },\n");
+
+    /* increment log item counter */
+    count++;
   }
+
+  /* put out informations for the list */
+  GetTimeRangeToShowLog(beginTime, endTime, &dateCount);
+  printf("\t info:{\n");
+  printf("\t\t beginTime: '%s',\n", beginTime);
+  printf("\t\t endTime: '%s',\n", endTime);
+  printf("\t\t listCount: %d,\n", count);
+  printf("\t\t dateCount: %d\n", dateCount);
+  printf("\t }\n");
 }
 
 /**********************************************/