X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.VerifyAccess.js;h=45f7613b9bc3bbe08e0ea2019abab9bcb1ddb7a6;hp=febcee38c1524ceaa777793ee2b45f4c73c34448;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=14222d019d925a9b1a75941ab4388b28998543a0

diff --git a/Pman.Dialog.VerifyAccess.js b/Pman.Dialog.VerifyAccess.js
index febcee38..45f7613b 100644
--- a/Pman.Dialog.VerifyAccess.js
+++ b/Pman.Dialog.VerifyAccess.js
@@ -8,11 +8,11 @@ Pman.Dialog.VerifyAccess= function() {}
 Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
 
  _strings : {
-  '294176b7ee742a4fcfe2085448e6f138' :"Cacel",
   'e2c9d024b79dfb48b42a7807206c6aed' :"Verify New IP Access",
-  'd41d8cd98f00b204e9800998ecf8427e' :"",
+  'a12a3079e14ced46e69ba52b8a90b21a' :"IP",
   'f6039d44b29456b20f8f373155ae4973' :"Username",
   '004bf6c9a40003140292e97330236c53' :"Action",
+  '5a787141d53b573ec9b86e900bfe0d79' :"Expire Date",
   'dfb790522fdea3859af206d32916fe77' :"User Agent",
   '70d9be9b139893aa6c69b5e77e614311' :"Confirm"
  },
@@ -67,8 +67,22 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
               
                   _this.data = res.data;
                   
+                  if(_this.data.status != 0){
+                      _this.dialog.hide();
+                      Roo.bootstrap.MessageBox.alert('Notice', 'This IP has been verified [' + _this.data.ip + ']');
+                      return;
+                  }
+                  
                   _this.form.setValues(_this.data);
                   
+                  if(_this.data.status * 1 == 0){
+                      _this.form.findField('status').reset();
+                  }
+                  
+                  _this.form.findField('expire_dt').reset();
+                  
+                  _this.form.clearInvalid();
+                  
                   return;
               },
               failure: function(res) {
@@ -95,7 +109,7 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
             if(!_this.form.isValid()){
                 return;
             }
-            
+        
             _this.dialog.el.mask('Sending...');
             _this.form.doAction('submit');
             
@@ -103,50 +117,6 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
       },
       xns : Roo.bootstrap,
       '|xns' : 'Roo.bootstrap'
-     },
-     {
-      xtype : 'Button',
-      html : _this._strings['294176b7ee742a4fcfe2085448e6f138'] /* Cacel */,
-      weight : 'primary',
-      listeners : {
-       click : function (_self, e)
-        {
-            var path = window.location.pathname.split('/');
-            
-            var verify_key = path.pop();
-            
-            var id = path.pop();
-            
-            new Pman.Request({
-                url: baseURL + '/Roo/Coba_application_signup',
-                method : 'POST',
-                mask : 'Sending...',
-                params : {
-                    _resend : id
-                }, 
-                success : function(res) {
-                    var msg = "We have re-sent you an invitation via email." +
-                                "<br/><br/>" + 
-                                "Please check your inbox for the final registration step." + 
-                                 "<br/><br/>" + 
-                                "<B>(Note. emails may accidentally be sent to your Spam Folder)</B>";
-                                
-                    Roo.bootstrap.MessageBox.alert('Please check your email', msg) ;
-                },
-                failure: function(res) {
-                    Roo.bootstrap.MessageBox.alert('Error', res.errorMsg) ;
-                }
-            });
-        },
-       render : function (_self)
-        {
-            _this.btn_resend = _self;
-             this.el.setVisibilityMode(Roo.Element.DISPLAY);
-             this.el.hide();
-        }
-      },
-      xns : Roo.bootstrap,
-      '|xns' : 'Roo.bootstrap'
      }
     ],
     items  : [
@@ -165,16 +135,14 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
             }
             if (action.type == 'load') {
                 
-                if(_this.data.status * 1 == 0){
-                    _this.form.findField('status').reset();
-                }
-                
                 return;
             }
             if (action.type =='submit') {
                 
                 _this.dialog.hide();
                 
+                Roo.bootstrap.MessageBox.alert('Notice', 'You have verified the IP [' + _this.data.ip + ']');
+                
                 return;
             }
             
@@ -226,14 +194,23 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
             '|xns' : 'Roo.bootstrap'
            }
           ]
-         }
-        ]
-       },
-       {
-        xtype : 'Row',
-        xns : Roo.bootstrap,
-        '|xns' : 'Roo.bootstrap',
-        items  : [
+         },
+         {
+          xtype : 'Column',
+          xs : 12,
+          xns : Roo.bootstrap,
+          '|xns' : 'Roo.bootstrap',
+          items  : [
+           {
+            xtype : 'Input',
+            fieldLabel : _this._strings['a12a3079e14ced46e69ba52b8a90b21a'] /* IP */,
+            name : 'ip',
+            readOnly : true,
+            xns : Roo.bootstrap,
+            '|xns' : 'Roo.bootstrap'
+           }
+          ]
+         },
          {
           xtype : 'Column',
           xs : 12,
@@ -251,14 +228,7 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
             '|xns' : 'Roo.bootstrap'
            }
           ]
-         }
-        ]
-       },
-       {
-        xtype : 'Row',
-        xns : Roo.bootstrap,
-        '|xns' : 'Roo.bootstrap',
-        items  : [
+         },
          {
           xtype : 'Column',
           xs : 12,
@@ -268,18 +238,29 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
            {
             xtype : 'ComboBox',
             allowBlank : false,
+            alwaysQuery : true,
             displayField : 'value',
             editable : false,
             fieldLabel : _this._strings['004bf6c9a40003140292e97330236c53'] /* Action */,
+            forceSelection : true,
             hiddenName : 'status',
+            indicatorpos : 'right',
             mode : 'local',
             name : 'status_name',
+            selectOnFocus : true,
+            tpl : '<div class=\"roo-select2-result\"><b>{value}</b></div>',
             triggerAction : 'all',
             valueField : 'code',
             listeners : {
              select : function (combo, record, index)
               {
+                  _this.expire_dt.allowBlank = true;
+                  _this.expire_dt.el.hide();
                   
+                  if(record.data.code == '-2'){
+                      _this.expire_dt.allowBlank = false;
+                      _this.expire_dt.el.show();
+                  }
               }
             },
             xns : Roo.bootstrap,
@@ -288,6 +269,7 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
              xtype : 'SimpleStore',
              data : [
                  ['1', 'Approve'],
+                 ['-2', 'Temporary'],
                  ['-1', 'Reject']
              ],
              fields : [ 'code', 'value' ],
@@ -296,6 +278,40 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
             }
            }
           ]
+         },
+         {
+          xtype : 'Column',
+          xs : 12,
+          xns : Roo.bootstrap,
+          '|xns' : 'Roo.bootstrap',
+          items  : [
+           {
+            xtype : 'DateField',
+            allowBlank : false,
+            fieldLabel : _this._strings['5a787141d53b573ec9b86e900bfe0d79'] /* Expire Date */,
+            format : 'Y-m-d',
+            indicatorpos : 'right',
+            name : 'expire_dt',
+            listeners : {
+             render : function (_self)
+              {
+                  _this.expire_dt = this;
+                  
+                  var d = new Date();
+                  
+                  d.setDate(d.getDate() - 1);
+              
+                  this.setStartDate(d);
+                  
+                  this.el.setVisibilityMode(Roo.Element.DISPLAY);
+                  
+                  this.el.hide();
+              }
+            },
+            xns : Roo.bootstrap,
+            '|xns' : 'Roo.bootstrap'
+           }
+          ]
          }
         ]
        },
@@ -329,43 +345,6 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, {
         ]
        }
       ]
-     },
-     {
-      xtype : 'Row',
-      listeners : {
-       render : function (_self)
-        {
-            _this.error_row = this;
-            
-            this.el.setVisibilityMode(Roo.Element.DISPLAY);
-            
-            this.el.hide();
-        }
-      },
-      xns : Roo.bootstrap,
-      '|xns' : 'Roo.bootstrap',
-      items  : [
-       {
-        xtype : 'Column',
-        xs : 12,
-        xns : Roo.bootstrap,
-        '|xns' : 'Roo.bootstrap',
-        items  : [
-         {
-          xtype : 'Element',
-          html : _this._strings['d41d8cd98f00b204e9800998ecf8427e'] /*  */,
-          listeners : {
-           render : function (_self)
-            {
-                _this.text_el = _self;
-            }
-          },
-          xns : Roo.bootstrap,
-          '|xns' : 'Roo.bootstrap'
-         }
-        ]
-       }
-      ]
      }
     ]
    }  );