Commit e7187da0091cdbf5be2472fc382bbbfab6fa7e26
1 parent
f3ff4bdd
Exists in
master
and in
2 other branches
modified table style, fixed tab options positions and set initial date with loading initial data too
Showing
10 changed files
with
48 additions
and
32 deletions
Show diff stats
dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc
No preview for this file type
dashboards/static/dashboards/css/dataTables.bootstrap.min.css
0 → 100644
| ... | ... | @@ -0,0 +1 @@ |
| 1 | +table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:75px;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:0.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:8px;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:8px;right:8px;display:block;font-family:'Glyphicons Halflings';opacity:0.5}table.dataTable thead .sorting:after{opacity:0.2;content:"\e150"}table.dataTable thead .sorting_asc:after{content:"\e155"}table.dataTable thead .sorting_desc:after{content:"\e156"}table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{color:#eee}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody>table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody>table>thead .sorting:after,div.dataTables_scrollBody>table>thead .sorting_asc:after,div.dataTables_scrollBody>table>thead .sorting_desc:after{display:none}div.dataTables_scrollBody>table>tbody>tr:first-child>th,div.dataTables_scrollBody>table>tbody>tr:first-child>td{border-top:none}div.dataTables_scrollFoot>table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-condensed>thead>tr>th{padding-right:20px}table.dataTable.table-condensed .sorting:after,table.dataTable.table-condensed .sorting_asc:after,table.dataTable.table-condensed .sorting_desc:after{top:6px;right:6px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:0}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child{padding-right:0} | ... | ... |
dashboards/static/dashboards/css/general.css
| ... | ... | @@ -17,7 +17,8 @@ |
| 17 | 17 | width: 50%; |
| 18 | 18 | margin-bottom: 0px; } |
| 19 | 19 | #general-report-header ul a { |
| 20 | - width: 100%; } | |
| 20 | + width: 100%; | |
| 21 | + text-decoration: none; } | |
| 21 | 22 | |
| 22 | 23 | li.tab-option { |
| 23 | 24 | margin-right: 2%; |
| ... | ... | @@ -28,6 +29,8 @@ li.tab-option { |
| 28 | 29 | text-align: center; |
| 29 | 30 | border-radius: 20px; |
| 30 | 31 | height: 30px; } |
| 32 | + li.tab-option:hover { | |
| 33 | + background-color: #bdbdbd; } | |
| 31 | 34 | |
| 32 | 35 | li.selected { |
| 33 | 36 | background-color: #4dcfbd; | ... | ... |
dashboards/static/dashboards/css/general.css.map
| 1 | 1 | { |
| 2 | 2 | "version": 3, |
| 3 | -"mappings": "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", | |
| 3 | +"mappings": "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", | |
| 4 | 4 | "sources": ["general.sass"], |
| 5 | 5 | "names": [], |
| 6 | 6 | "file": "general.css" | ... | ... |
dashboards/static/dashboards/css/general.sass
| ... | ... | @@ -22,7 +22,8 @@ $title-color: #009688 |
| 22 | 22 | |
| 23 | 23 | a |
| 24 | 24 | width: 100% |
| 25 | - | |
| 25 | + text-decoration: none | |
| 26 | + | |
| 26 | 27 | |
| 27 | 28 | li.tab-option |
| 28 | 29 | margin-right: 2% |
| ... | ... | @@ -33,7 +34,8 @@ li.tab-option |
| 33 | 34 | text-align: center |
| 34 | 35 | border-radius: 20px |
| 35 | 36 | height: 30px |
| 36 | - | |
| 37 | + &:hover | |
| 38 | + background-color: #bdbdbd | |
| 37 | 39 | |
| 38 | 40 | li.selected |
| 39 | 41 | background-color: #4dcfbd | ... | ... |
dashboards/static/dashboards/js/behavior.js
| ... | ... | @@ -114,7 +114,7 @@ var selectors_options = { |
| 114 | 114 | $(e).after(string_build); |
| 115 | 115 | var new_elem = $(e).next(); |
| 116 | 116 | new_elem.slideDown({easing: 'easeInOutSine'}, 5000); |
| 117 | - $(e).attr("opened", true); | |
| 117 | + $(e).attr("opened"); | |
| 118 | 118 | |
| 119 | 119 | }, |
| 120 | 120 | deleteChildren: function(e){ | ... | ... |
dashboards/static/dashboards/js/logbehavior.js
| 1 | 1 | $(document).ready(function(){ |
| 2 | - $('#init_date').datetimepicker(); | |
| 2 | + d = new Date(); | |
| 3 | + d.setDate(d.getDate() - 30); | |
| 4 | + $('#init_date').datetimepicker({ | |
| 5 | + defaultDate: d, | |
| 6 | + }); | |
| 3 | 7 | $('#end_date').datetimepicker({ |
| 4 | - useCurrent: false //Important! See issue #1075 | |
| 8 | + useCurrent: false, //Important! See issue #1075 | |
| 9 | + defaultDate: new Date() | |
| 5 | 10 | }); |
| 6 | 11 | $("#init_date").on("dp.change", function (e) { |
| 7 | 12 | $('#end_date').data("DateTimePicker").minDate(e.date); |
| 13 | + end_date = $("#end_date").data("DateTimePicker").date(); | |
| 14 | + log.refresh_log_data(e.date, end_date); | |
| 8 | 15 | }); |
| 9 | 16 | $("#end_date").on("dp.change", function (e) { |
| 10 | 17 | $('#init_date').data("DateTimePicker").maxDate(e.date); |
| ... | ... | @@ -12,8 +19,10 @@ $(document).ready(function(){ |
| 12 | 19 | init_date = $("#init_date").data("DateTimePicker").date(); |
| 13 | 20 | log.refresh_log_data(init_date, e.date); |
| 14 | 21 | }); |
| 15 | - | |
| 16 | - | |
| 22 | + //initialize the table with log from last 30 days | |
| 23 | + init_date = $("#init_date").data("DateTimePicker").date(); | |
| 24 | + end_date = $("#end_date").data("DateTimePicker").date(); | |
| 25 | + log.refresh_log_data(init_date, end_date); | |
| 17 | 26 | }); |
| 18 | 27 | |
| 19 | 28 | |
| ... | ... | @@ -29,15 +38,13 @@ var log = { |
| 29 | 38 | render_table: function(target_id, data){ |
| 30 | 39 | table_body = $('#' + target_id); |
| 31 | 40 | |
| 41 | + tables = $('#log-table_wrapper'); | |
| 42 | + if (tables.length > 0){ | |
| 43 | + $(tables).remove(); | |
| 44 | + } | |
| 32 | 45 | |
| 33 | 46 | |
| 34 | 47 | content = "<table id='log-table' class='table table-striped table-bordered'>"; |
| 35 | - | |
| 36 | - //add register count | |
| 37 | - count = data.length; | |
| 38 | - | |
| 39 | - $(table_body).append( "<h3 id='log-count'>"+count + " registros" + "</h3>"); | |
| 40 | - | |
| 41 | 48 | //load row names at the top |
| 42 | 49 | content += "<thead><th> Datetime </th> <th> Usuário </th> <th> Components </th> <th> Recurso </th><th> Ação </th>" |
| 43 | 50 | + "<th> Categoria </th> <th> Assunto </th> <th> Contexto </th></thead>" | ... | ... |
dashboards/templates/dashboards/general.html
dashboards/templates/dashboards/log.html
| ... | ... | @@ -2,21 +2,9 @@ |
| 2 | 2 | {% load django_bootstrap_breadcrumbs %} |
| 3 | 3 | |
| 4 | 4 | <section id="general-report"> |
| 5 | - <header id="general-report-header"> | |
| 6 | - <h3>{% trans "Amadeus Report" %}</h3> | |
| 7 | - | |
| 8 | - <ul id="report-header-options"> | |
| 9 | - <a href="{% url 'dashboards:view_general' %}"><li class="tab-option"> | |
| 10 | - {% trans "Focus" %} | |
| 11 | - </li></a> | |
| 12 | - <li class="tab-option selected"> | |
| 13 | - {% trans "Log" %} | |
| 14 | - </li> | |
| 15 | - </ul> | |
| 16 | - </header> | |
| 17 | - <div id="period-selector"> | |
| 5 | + <div id="period-selector"> | |
| 18 | 6 | <div class="container"> |
| 19 | - <div class='col-md-5'> | |
| 7 | + <div class='col-md-4'> | |
| 20 | 8 | <div class="form-group"> |
| 21 | 9 | <div class='input-group date' id='init_date'> |
| 22 | 10 | <input type='text' class="form-control" /> |
| ... | ... | @@ -26,7 +14,7 @@ |
| 26 | 14 | </div> |
| 27 | 15 | </div> |
| 28 | 16 | </div> |
| 29 | - <div class='col-md-5'> | |
| 17 | + <div class='col-md-4'> | |
| 30 | 18 | <div class="form-group"> |
| 31 | 19 | <div class='input-group date' id='end_date'> |
| 32 | 20 | <input type='text' class="form-control" /> |
| ... | ... | @@ -37,8 +25,21 @@ |
| 37 | 25 | </div> |
| 38 | 26 | </div> |
| 39 | 27 | </div> |
| 40 | - | |
| 28 | + <button class="btn btn-success btn-lg">{% trans "search" %}</button> | |
| 41 | 29 | </div> |
| 30 | + <header id="general-report-header"> | |
| 31 | + <h3>{% trans "Amadeus Report" %}</h3> | |
| 32 | + | |
| 33 | + <ul id="report-header-options"> | |
| 34 | + <a href="{% url 'dashboards:view_general' %}"><li class="tab-option"> | |
| 35 | + {% trans "Focus" %} | |
| 36 | + </li></a> | |
| 37 | + <li class="tab-option selected"> | |
| 38 | + {% trans "Log" %} | |
| 39 | + </li> | |
| 40 | + </ul> | |
| 41 | + </header> | |
| 42 | + | |
| 42 | 43 | <article class="report-body"> |
| 43 | 44 | |
| 44 | 45 | ... | ... |
dashboards/views.py
| ... | ... | @@ -120,7 +120,8 @@ class LogView(LogMixin, generic.TemplateView): |
| 120 | 120 | context['javascript_files'] = ['dashboards/js/logbehavior.js', |
| 121 | 121 | 'dashboards/js/dataTables.bootstrap.min.js', 'dashboards/js/jquery.dataTables.min.js'] |
| 122 | 122 | context['child_template'] = "dashboards/log.html" |
| 123 | - context['style_files'] = ['dashboards/css/general.css', 'dashboards/css/jquery.dataTables.min.css' ] | |
| 123 | + context['style_files'] = [ 'dashboards/css/jquery.dataTables.min.css', 'dashboards/css/general.css', | |
| 124 | + 'dashboards/css/dataTables.bootstrap.min.css' ] | |
| 124 | 125 | return context |
| 125 | 126 | |
| 126 | 127 | ... | ... |