djgentelella 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

djgentelella/static/gentelella/css/custom.css

@@ -866,7 +866,7 @@ a:focus {
 }
 
 .wysiwyg{
-    overflow:scroll; 
+    overflow:scroll;
     max-height:500px;
 }
 .nav>li>a:hover,
@@ -4611,4 +4611,44 @@ border-bottom:2px solid #E6E9ED;
 }
 .menu-top-navbar:hover{
   color:inherit;
-}
+}
+
+.file-link {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.input-group > .custom-file {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+}
+
+.custom-file {
+    position: relative;
+    display: inline-block;
+    width: 100%;
+    height: calc(1.47em + 1rem + 2px);
+    margin-bottom: 0;
+    border: 1px solid #ccc;
+}
+
+input-group > .custom-file {
+    position: relative;
+    -webkit-box-flex: 1;
+    -ms-flex: 1 1 0%;
+    flex: 1 1 0%;
+    min-width: 0;
+    margin-bottom: 0;
+}
+.custom-file-input {
+    position: relative;
+    z-index: 2;
+    width: 100%;
+    height: calc(1.47em + 1rem + 2px);
+    margin: 0;
+    opacity: 0;
+}

djgentelella/static/gentelella/js/base/dateranges_gridslider.js

@@ -104,7 +104,6 @@ function grid_slider(instance) {
         'onChange': function (data) {
             $("input[name=" + obj.attr('data-target-from') + "]").val(data.from);
             $("input[name=" + obj.attr('data-target-to') + "]").val(data.to);
-            console.log(obj.attr('data-target-to'));
         }
     }
     return option;
@@ -157,7 +156,7 @@ function date_grid_slider(instance) {
         });
     }
 
-    instance.ionRangeSlider({
+    return instance.ionRangeSlider({
         type: "single",
         hide_min_max: false,
         min: dateToTS(new Date(obj.attr('data_min'))),

djgentelella/static/gentelella/js/base/fileupload.widget.js

@@ -27,77 +27,180 @@ $.fn.fileuploadwidget = function(){
         }
 
 
-        $.each($(this), function(i, e){
-            var $this=$(e),
-                $parentdiv=$this.closest('.input-group'),
-                upload_url = $this.data('href'),
-                field_name = $this.attr('name'),
-                div_message = $parentdiv.find($this.data('message')),
-                div_process = $parentdiv.find($this.data('process')),
-                url_done = $this.data('done'),
-                input_token = $this.data('inputtoken'),
-                fileshow = $parentdiv.find('.fileshow'),
-                uploadfilecontent = $parentdiv.find('.uploadfilecontent'),
-                removecheck = $this.closest('.fileupload').find('input[data-widget="CheckboxInput"]');
+    $.each($(this), function(i, e){
+            var $this=$(e);
+            var $parentdiv=$this.closest('.fileupload');
+            var input_token=$this.data('inputtoken');
+            var obj={
+                    parentdiv: $this.closest('.input-group'),
+                    upload_url: $this.data('href'),
+                    field_name: $this.attr('name'),
+                    div_message: $parentdiv.find($this.data('message')),
+                    div_process: $parentdiv.find($this.data('process')),
+                    div_download: $parentdiv.find("#download_"+$this.data('inputtoken') ),
+                    div_remove: $parentdiv.find("#remove_"+$this.data('inputtoken') ),
+                    url_done: $this.data('done'),
+                    current_icon: 'eyes',
+                    input_token: input_token,
+                    input_field: $parentdiv.find('input[name="'+input_token+'"]'),
+                    default_value: "",
+                    fileshow: $parentdiv.find('.fileshow'),
+                    uploadfilecontent: $parentdiv.find('.uploadfilecontent'),
+                    removecheck: $this.closest('.fileupload').find('input[data-widget="CheckboxInput"]'),
+                    change_fn: function(e){
+                        var parent=e;
+                        return function(event){
+                            let current_value=parent.input_field.val();
+                            if(current_value.length==0){
+                                current_value=parent.default_value;
+                            }
+                            try{
+                                let data = JSON.parse(current_value);
+                                parent.render_widget_data(data);
+                            }catch(e) {
+                                // do nothing
+                            }
 
-           $this.attr("required", false);
-           div_message.hide();
-           fileshow.on('click', function(){
-                uploadfilecontent.toggle();
-                div_message.toggle();
-           });
-           removecheck.on('ifToggled', function(event){
-               if(this.checked){
-                    $parentdiv.find('input[name="'+input_token+'"]').val("0");
-               }else{
-                 if( $parentdiv.find('input[name="'+input_token+'"]').val() == "0"){
-                    $parentdiv.find('input[name="'+input_token+'"]').val("");
-                 }
-               }
-           });
-           $this.fileupload({
-              url: upload_url,
-              dataType: "json",
-              maxChunkSize: 100000, // Chunks of 100 kB
-              formData: form_data,
-              dropZone: $this,
-              add: function(e, data) { // Called before starting upload
+                        }
+                    },
+                    icon_action_toggle: function(){
+                        if(this.current_icon==='eyes'){
+                            this.show_upload();
+                        }else{
+                            this.show_eyes();
+                        }
+                    },
+                    show_eyes:function(){
+                        this.current_icon='eyes';
+                        this.change_icon_file_show('fa fa-eye');
+                    },
+                    show_upload: function(){
+                        this.current_icon='upload';
+                        this.change_icon_file_show('fa fa-cloud-upload');
+                    },
+                    render_widget_data: function(data){
+                        var parent=this;
+                        if("token" in data ){
+                            //data.display_name
+                            parent.uploadfilecontent.hide();
+                            parent.div_download.hide();
+                            parent.div_remove.hide();
+                            parent.div_message.show();
+                            parent.div_message.html(data.display_name);
+                            parent.show_upload();
+                        }else if ("url" in data){
+                            parent.div_download.show();
+                            parent.div_remove.show();
+                            parent.div_message.show();
+                            parent.uploadfilecontent.hide();
+                            parent.div_download.find('a')[0].href=data.url;
+                            parent.div_message.html(data.display_name);
+                            parent.show_upload();
+                        }else{
+                            parent.div_download.hide();
+                            parent.div_remove.hide();
+                            parent.uploadfilecontent.show();
+                            parent.div_message.hide();
+                            parent.show_eyes();
+                        }
+                    },
+                    change_icon_file_show: function(touseclass){
+                        this.fileshow.find('i').removeClass();
+                        this.fileshow.find('i').addClass(touseclass);
+                    },
+                    init: function(){
+                        $this.attr("required", false);
+                        this.div_message.hide();
+                        this.div_remove.hide();
+                        var parent=this;
+                        this.fileshow.on('click', function(){
+                            parent.uploadfilecontent.toggle();
+                            parent.div_message.toggle();
+                            parent.icon_action_toggle();
+                       });
+                       this.input_field[0].onchange=this.change_fn(this);
+                       this.default_value=this.input_field.val();
+                       if(this.default_value !== ""){
+                            this.input_field.trigger('change');
+                       }
+                       this.removecheck.on('ifToggled', function(event){
+                           let current_data=JSON.parse(parent.input_field.val());
+                           if(this.checked){
+                                current_data['actions']="delete";
+                           }else{
+                            if('actions' in current_data) delete current_data.actions;
+                           }
+                           parent.input_field.val(JSON.stringify(current_data));
+                       });
+                       $this.fileupload({
+                                  url: parent.upload_url,
+                                  dataType: "json",
+                                  maxChunkSize: 100000, // Chunks of 100 kB
+                                  formData: form_data,
+                                  dropZone: $this,
+                                  add: function(e, data) { // Called before starting upload
 
-                div_message.empty();
-                // If this is the second file you're uploading we need to remove the
-                // old upload_id and just keep the csrftoken (which is always first).
-                form_data.splice(1);
-                calculate_md5(data.files[0], 100000);  // Again, chunks of 100 kB
-                data.paramName='file';
-                data.submit();
-                uploadfilecontent.hide();
-                div_message.show();
-                div_message.html(data.files[0].name);
-              },
-              chunkdone: function (e, data) { // Called after uploading each chunk
-                if (form_data.length < 2) {
-                  form_data.push(
-                    {"name": "upload_id", "value": data.result.upload_id}
-                  );
-                }
-                 var progress = parseInt(data.loaded / data.total * 100.0, 10);
-                div_process.text(  progress + "%");
-              }
-            }).bind('fileuploaddone', function (e, data) {
-                $parentdiv.find('input[name="'+input_token+'"]').val(data.result.upload_id);
-                $.ajax({
-                      type: "POST",
-                      url: url_done,
-                      data: {
-                        csrfmiddlewaretoken: csrf,
-                        upload_id: data.result.upload_id,
-                        md5: md5
-                      },
-                      dataType: "json",
-                      success: function(data) {
-                        div_process.html(' <i class="fa fa-check"></i>');
-                      }
-                });
-            });
-        });
-}
+                                    parent.div_message.empty();
+                                    // If this is the second file you're uploading we need to remove the
+                                    // old upload_id and just keep the csrftoken (which is always first).
+                                    form_data.splice(1);
+                                    calculate_md5(data.files[0], 100000);  // Again, chunks of 100 kB
+                                    data.paramName='file';
+                                    data.submit();
+                                    parent.uploadfilecontent.hide();
+                                    parent.div_message.show();
+                                    parent.div_message.html(data.files[0].name);
+                                  },
+                                  chunkdone: function (e, data) { // Called after uploading each chunk
+                                    if (form_data.length < 2) {
+                                      form_data.push(
+                                        {"name": "upload_id", "value": data.result.upload_id}
+                                      );
+                                    }
+                                     var progress = parseInt(data.loaded / data.total * 100.0, 10);
+                                    parent.div_process.text(  progress + "%");
+                                  }
+                                }).bind('fileuploaddone', function (e, data) {
+                                        parent.input_field.val(JSON.stringify(
+                                        {'token': data.result.upload_id,
+                                        'display_name': data.files[0].name }));
+                                        parent.input_field.trigger('change');
+                                        $.ajax({
+                                              type: "POST",
+                                              url: parent.url_done,
+                                              data: {
+                                                csrfmiddlewaretoken: csrf,
+                                                upload_id: data.result.upload_id,
+                                                md5: md5
+                                              },
+                                              dataType: "json",
+                                              success: function(data) {
+                                                parent.div_process.html(' <i class="fa fa-check"></i>');
+                                              }
+                                        });
+                                   }).bind('fileuploadchunkfail', function (e, data) {
+                                   parent.resetEmpty();
+                                   Swal.fire(
+                                            gettext('Problem in the Internet?'),
+                                            data.errorThrown,
+                                            'error'
+                                            );
+                                   });
+                       },
+                    resetEmpty: function(){
+                        this.div_message.html("");
+                        this.div_message.hide();
+                        this.div_download.hide();
+                        this.div_remove.hide();
+                        this.uploadfilecontent.show();
+                    },
+                    addRemote: function(item){
+                        this.input_field.val(JSON.stringify(item));
+                        this.input_field.trigger('change');
+                    }
+                };
+                obj.init();
+            $this.data('fileUploadWidget', obj);
+
+ });
+}

djgentelella/static/gentelella/js/base.js

@@ -358,81 +358,185 @@ $.fn.fileuploadwidget = function(){
         }
 
 
-        $.each($(this), function(i, e){
-            var $this=$(e),
-                $parentdiv=$this.closest('.input-group'),
-                upload_url = $this.data('href'),
-                field_name = $this.attr('name'),
-                div_message = $parentdiv.find($this.data('message')),
-                div_process = $parentdiv.find($this.data('process')),
-                url_done = $this.data('done'),
-                input_token = $this.data('inputtoken'),
-                fileshow = $parentdiv.find('.fileshow'),
-                uploadfilecontent = $parentdiv.find('.uploadfilecontent'),
-                removecheck = $this.closest('.fileupload').find('input[data-widget="CheckboxInput"]');
-
-           $this.attr("required", false);
-           div_message.hide();
-           fileshow.on('click', function(){
-                uploadfilecontent.toggle();
-                div_message.toggle();
-           });
-           removecheck.on('ifToggled', function(event){
-               if(this.checked){
-                    $parentdiv.find('input[name="'+input_token+'"]').val("0");
-               }else{
-                 if( $parentdiv.find('input[name="'+input_token+'"]').val() == "0"){
-                    $parentdiv.find('input[name="'+input_token+'"]').val("");
-                 }
-               }
-           });
-           $this.fileupload({
-              url: upload_url,
-              dataType: "json",
-              maxChunkSize: 100000, // Chunks of 100 kB
-              formData: form_data,
-              dropZone: $this,
-              add: function(e, data) { // Called before starting upload
-
-                div_message.empty();
-                // If this is the second file you're uploading we need to remove the
-                // old upload_id and just keep the csrftoken (which is always first).
-                form_data.splice(1);
-                calculate_md5(data.files[0], 100000);  // Again, chunks of 100 kB
-                data.paramName='file';
-                data.submit();
-                uploadfilecontent.hide();
-                div_message.show();
-                div_message.html(data.files[0].name);
-              },
-              chunkdone: function (e, data) { // Called after uploading each chunk
-                if (form_data.length < 2) {
-                  form_data.push(
-                    {"name": "upload_id", "value": data.result.upload_id}
-                  );
-                }
-                 var progress = parseInt(data.loaded / data.total * 100.0, 10);
-                div_process.text(  progress + "%");
-              }
-            }).bind('fileuploaddone', function (e, data) {
-                $parentdiv.find('input[name="'+input_token+'"]').val(data.result.upload_id);
-                $.ajax({
-                      type: "POST",
-                      url: url_done,
-                      data: {
-                        csrfmiddlewaretoken: csrf,
-                        upload_id: data.result.upload_id,
-                        md5: md5
-                      },
-                      dataType: "json",
-                      success: function(data) {
-                        div_process.html(' <i class="fa fa-check"></i>');
-                      }
-                });
-            });
-        });
+    $.each($(this), function(i, e){
+            var $this=$(e);
+            var $parentdiv=$this.closest('.fileupload');
+            var input_token=$this.data('inputtoken');
+            var obj={
+                    parentdiv: $this.closest('.input-group'),
+                    upload_url: $this.data('href'),
+                    field_name: $this.attr('name'),
+                    div_message: $parentdiv.find($this.data('message')),
+                    div_process: $parentdiv.find($this.data('process')),
+                    div_download: $parentdiv.find("#download_"+$this.data('inputtoken') ),
+                    div_remove: $parentdiv.find("#remove_"+$this.data('inputtoken') ),
+                    url_done: $this.data('done'),
+                    current_icon: 'eyes',
+                    input_token: input_token,
+                    input_field: $parentdiv.find('input[name="'+input_token+'"]'),
+                    default_value: "",
+                    fileshow: $parentdiv.find('.fileshow'),
+                    uploadfilecontent: $parentdiv.find('.uploadfilecontent'),
+                    removecheck: $this.closest('.fileupload').find('input[data-widget="CheckboxInput"]'),
+                    change_fn: function(e){
+                        var parent=e;
+                        return function(event){
+                            let current_value=parent.input_field.val();
+                            if(current_value.length==0){
+                                current_value=parent.default_value;
+                            }
+                            try{
+                                let data = JSON.parse(current_value);
+                                parent.render_widget_data(data);
+                            }catch(e) {
+                                // do nothing
+                            }
+
+                        }
+                    },
+                    icon_action_toggle: function(){
+                        if(this.current_icon==='eyes'){
+                            this.show_upload();
+                        }else{
+                            this.show_eyes();
+                        }
+                    },
+                    show_eyes:function(){
+                        this.current_icon='eyes';
+                        this.change_icon_file_show('fa fa-eye');
+                    },
+                    show_upload: function(){
+                        this.current_icon='upload';
+                        this.change_icon_file_show('fa fa-cloud-upload');
+                    },
+                    render_widget_data: function(data){
+                        var parent=this;
+                        if("token" in data ){
+                            //data.display_name
+                            parent.uploadfilecontent.hide();
+                            parent.div_download.hide();
+                            parent.div_remove.hide();
+                            parent.div_message.show();
+                            parent.div_message.html(data.display_name);
+                            parent.show_upload();
+                        }else if ("url" in data){
+                            parent.div_download.show();
+                            parent.div_remove.show();
+                            parent.div_message.show();
+                            parent.uploadfilecontent.hide();
+                            parent.div_download.find('a')[0].href=data.url;
+                            parent.div_message.html(data.display_name);
+                            parent.show_upload();
+                        }else{
+                            parent.div_download.hide();
+                            parent.div_remove.hide();
+                            parent.uploadfilecontent.show();
+                            parent.div_message.hide();
+                            parent.show_eyes();
+                        }
+                    },
+                    change_icon_file_show: function(touseclass){
+                        this.fileshow.find('i').removeClass();
+                        this.fileshow.find('i').addClass(touseclass);
+                    },
+                    init: function(){
+                        $this.attr("required", false);
+                        this.div_message.hide();
+                        this.div_remove.hide();
+                        var parent=this;
+                        this.fileshow.on('click', function(){
+                            parent.uploadfilecontent.toggle();
+                            parent.div_message.toggle();
+                            parent.icon_action_toggle();
+                       });
+                       this.input_field[0].onchange=this.change_fn(this);
+                       this.default_value=this.input_field.val();
+                       if(this.default_value !== ""){
+                            this.input_field.trigger('change');
+                       }
+                       this.removecheck.on('ifToggled', function(event){
+                           let current_data=JSON.parse(parent.input_field.val());
+                           if(this.checked){
+                                current_data['actions']="delete";
+                           }else{
+                            if('actions' in current_data) delete current_data.actions;
+                           }
+                           parent.input_field.val(JSON.stringify(current_data));
+                       });
+                       $this.fileupload({
+                                  url: parent.upload_url,
+                                  dataType: "json",
+                                  maxChunkSize: 100000, // Chunks of 100 kB
+                                  formData: form_data,
+                                  dropZone: $this,
+                                  add: function(e, data) { // Called before starting upload
+
+                                    parent.div_message.empty();
+                                    // If this is the second file you're uploading we need to remove the
+                                    // old upload_id and just keep the csrftoken (which is always first).
+                                    form_data.splice(1);
+                                    calculate_md5(data.files[0], 100000);  // Again, chunks of 100 kB
+                                    data.paramName='file';
+                                    data.submit();
+                                    parent.uploadfilecontent.hide();
+                                    parent.div_message.show();
+                                    parent.div_message.html(data.files[0].name);
+                                  },
+                                  chunkdone: function (e, data) { // Called after uploading each chunk
+                                    if (form_data.length < 2) {
+                                      form_data.push(
+                                        {"name": "upload_id", "value": data.result.upload_id}
+                                      );
+                                    }
+                                     var progress = parseInt(data.loaded / data.total * 100.0, 10);
+                                    parent.div_process.text(  progress + "%");
+                                  }
+                                }).bind('fileuploaddone', function (e, data) {
+                                        parent.input_field.val(JSON.stringify(
+                                        {'token': data.result.upload_id,
+                                        'display_name': data.files[0].name }));
+                                        parent.input_field.trigger('change');
+                                        $.ajax({
+                                              type: "POST",
+                                              url: parent.url_done,
+                                              data: {
+                                                csrfmiddlewaretoken: csrf,
+                                                upload_id: data.result.upload_id,
+                                                md5: md5
+                                              },
+                                              dataType: "json",
+                                              success: function(data) {
+                                                parent.div_process.html(' <i class="fa fa-check"></i>');
+                                              }
+                                        });
+                                   }).bind('fileuploadchunkfail', function (e, data) {
+                                   parent.resetEmpty();
+                                   Swal.fire(
+                                            gettext('Problem in the Internet?'),
+                                            data.errorThrown,
+                                            'error'
+                                            );
+                                   });
+                       },
+                    resetEmpty: function(){
+                        this.div_message.html("");
+                        this.div_message.hide();
+                        this.div_download.hide();
+                        this.div_remove.hide();
+                        this.uploadfilecontent.show();
+                    },
+                    addRemote: function(item){
+                        this.input_field.val(JSON.stringify(item));
+                        this.input_field.trigger('change');
+                    }
+                };
+                obj.init();
+            $this.data('fileUploadWidget', obj);
+
+ });
 }
 
+
 function extract_select2_context(context, instance){
     let data=instance.data();
     let dropdownparent=data.dropdownparent;
@@ -1254,7 +1358,6 @@ function grid_slider(instance) {
         'onChange': function (data) {
             $("input[name=" + obj.attr('data-target-from') + "]").val(data.from);
             $("input[name=" + obj.attr('data-target-to') + "]").val(data.to);
-            console.log(obj.attr('data-target-to'));
         }
     }
     return option;
@@ -1307,7 +1410,7 @@ function date_grid_slider(instance) {
         });
     }
 
-    instance.ionRangeSlider({
+    return instance.ionRangeSlider({
         type: "single",
         hide_min_max: false,
         min: dateToTS(new Date(obj.attr('data_min'))),