Skip to content

Commit

Permalink
Merge pull request #235 from eaudeweb/160_select2_winners
Browse files Browse the repository at this point in the history 
Set select2 for organizations and vendors #160
  • Loading branch information
@alexneamtu
alexneamtu authored Oct 17, 2019
2 parents e82d8c5 + b4292a7 commit 7df901a
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 112 deletions.
75 changes: 39 additions & 36 deletions app/static/css/filter_bar.css
View file
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
.filter_menu {
padding-top: 20px;
padding-left: 130px;
padding-right: 130px;
padding-top: 20px;
padding-left: 130px;
padding-right: 130px;

}
.up_bar {
background: #333;
border-radius: 3px;
alignment: center;
padding-left: 5px;
height:30px;
font-weight: bold;
font-family: "Arial";
font-size: large;
color: white;
background: #333;
border-radius: 3px;
alignment: center;
padding-left: 5px;
height:30px;
font-weight: bold;
font-family: "Arial";
font-size: large;
color: white;
}

.bottom_bar {
background: #f8f8f8;
border-radius: 3px;
border: 2px solid gainsboro;
padding-left: 5px;
padding-top: 5px;
height: 70px;
font-weight: bold;
font-family: "Arial";
font-size: 15px;
position: relative;
background: #f8f8f8;
border-radius: 3px;
border: 2px solid gainsboro;
padding-left: 5px;
padding-top: 5px;
font-weight: bold;
font-family: "Arial";
font-size: 15px;
position: relative;
}

.flexed {
display: flex;
}

.filter_button {
width: 120px;
font-family: "Arial";
width: 120px;
font-family: "Arial";
}

.div_button {
position: relative;
padding-top: 15px;
padding-left: 10px;
padding-top: 15px;
padding-right: 10px;
padding-left: 10px;
}

.date_filter {
margin-top: 13px;
padding-left: 10px;
font-size: 17px;
font-weight: bold;
color: #447e9b;
margin-top: 13px;
padding-left: 10px;
font-size: 17px;
font-weight: bold;
color: #447e9b;
}

.quiet {
padding-left: 12px;
font-size: 14px;
font-weight: normal;
color: #666666;
padding-left: 12px;
font-size: 14px;
font-weight: normal;
color: #666666;
}
2 changes: 2 additions & 0 deletions app/static/js/scratch_datatables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ $(document).ready(function() {
const ungm_published_today = $.urlParam(doc, 'ungm_published_today');
const archive = $.urlParam(doc, 'archive');

$('#id_organization').select2();
$('#id_vendor').select2();

function buttonsClick() {

Expand Down
90 changes: 50 additions & 40 deletions app/templates/awards_filters.html
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,57 @@
<!DOCTYPE html>
<html lang="en">
{% load static %}
{% load widget_tweaks %}
<head>
<link rel="stylesheet" type="text/css" href="{% static 'css/filter_bar.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap.min.css' %}"/>
</head>
{% load static %}
{% load widget_tweaks %}
<head>
<link rel="stylesheet" type="text/css" href="{% static 'css/filter_bar.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap.min.css' %}"/>
</head>

<body>
<div class="filter_menu">
<div class="row up_bar">
<div class="col-sm">
<p>Filter</p>
</div>
</div>
<form method="GET" id="form_id">
<div class="row bottom_bar">
<div class="form-group col-sm">
{{ form.organization.label }}
{% render_field form.organization class+="form-control form-control-sm" %}
</div>
<div class="form-group col-sm">
{{ form.source.label }}
{% render_field form.source class+="form-control form-control-sm" %}
</div>
<div class="form-group col-sm">
{{ form.vendor.label }}
{% render_field form.vendor class+="form-control form-control-sm" %}
<body>
<div class="filter_menu">
<div class="row up_bar">
<div class="col-sm">
<p>Filter</p>
</div>
</div>
<div class="form-group col-sm">
{{ form.value.label }}
{% render_field form.value class+="form-control form-control-sm" %}
</div>
<div class="col-sm div_button">
{% if reset %}
<a href="{% url 'contract_awards_list_view' %}"><button type="button" name="reset_filters" value="reset" class="btn btn-dark filter_button">Reset filters</button></a>
{% endif %}
</div>
<div class="col-sm div_button">
<button type="submit" name="filter_button" value="filter" class="btn btn-dark filter_button">Filter</button>

<div class="row bottom_bar">
<form method="GET" id="form_id">
<div class="flexed">
<div class="form-group col-sm">
{{ form.organization.label }}
{% render_field form.organization class+="form-control form-control-sm" %}
</div>
<div class="form-group col-sm">
{{ form.vendor.label }}
{% render_field form.vendor class+="form-control form-control-sm" %}
</div>
</div>

<div class="flexed">
<div class="form-group col-sm">
{{ form.source.label }}
{% render_field form.source class+="form-control form-control-sm" %}
</div>

<div class="form-group col-sm">
{{ form.value.label }}
{% render_field form.value class+="form-control form-control-sm" %}
</div>

{% if reset %}
<div class="div_button">
<a href="{% url 'contract_awards_list_view' %}"><button type="button" name="reset_filters" value="reset" class="btn btn-dark filter_button">Reset filters</button></a>
</div>
{% endif %}

<div class="div_button">
<button type="submit" name="filter_button" value="filter" class="btn btn-dark filter_button">Filter</button>
</div>
</div>
</form>
</div>

</div>
</form>
</div>
</body>
</body>
</html>
87 changes: 51 additions & 36 deletions app/templates/tenders_filters.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,61 @@
<p>Filter</p>
</div>
</div>
<form method="GET" id="form_id">
<div class="row bottom_bar ">
<div class="form-group col-sm">
{{ form.organization.label }}
{% render_field form.organization class+="form-control form-control-sm" %}
</div>
<div class="form-group col-sm">
{{ form.status.label }}
{% render_field form.status class+="form-control form-control-sm" %}
</div>
<div class="form-group col-sm">
{{ form.source.label }}
{% render_field form.source class+="form-control form-control-sm" %}
</div>
<div class ="form-group col-sm">
{{ form.favourite.label }}
{% render_field form.favourite class+="form-control form-control-sm" %}
</div>
<div class ="form-group col-sm">
{{ form.keyword.label }}
{% render_field form.keyword class+="form-control form-control-sm" %}
</div>
<div class ="form-group col-sm">
{{ form.type.label }}
{% render_field form.type class+="form-control form-control-sm" %}
</div>
<div class ="form-group col-sm">
{{ form.seen.label }}
{% render_field form.seen class+="form-control form-control-sm" %}

<div class="row bottom_bar">
<form method="GET" id="form_id">

<div class="flexed">
<div class="form-group col-lg">
{{ form.organization.label }}
{% render_field form.organization class+="form-control form-control-sm" %}
</div>
</div>
<div class="col-sm-2 div_button">

<div class="flexed">
<div class="form-group col-sm">
{{ form.status.label }}
{% render_field form.status class+="form-control form-control-sm" %}
</div>

<div class="form-group col-sm">
{{ form.source.label }}
{% render_field form.source class+="form-control form-control-sm" %}
</div>

<div class ="form-group col-sm">
{{ form.favourite.label }}
{% render_field form.favourite class+="form-control form-control-sm" %}
</div>

<div class ="form-group col-sm">
{{ form.keyword.label }}
{% render_field form.keyword class+="form-control form-control-sm" %}
</div>

<div class ="form-group col-sm">
{{ form.type.label }}
{% render_field form.type class+="form-control form-control-sm" %}
</div>

<div class ="form-group col-sm">
{{ form.seen.label }}
{% render_field form.seen class+="form-control form-control-sm" %}
</div>

{% if reset %}
<a href="{{ reset_url }}"><button type="button" name="reset_filters" value="reset" class="btn btn-dark filter_button">Reset filters</button></a>
<div class="div_button">
<a href="{{ reset_url }}"><button type="button" name="reset_filters" value="reset" class="btn btn-dark filter_button">Reset filters</button></a>
</div>
{% endif %}

<div class="div_button">
<button type="submit" name="filter_button" value="filter" class="btn btn-dark filter_button">Filter</button>
</div>
</div>
<div class="col-sm div_button">
<button type="submit" name="filter_button" value="filter" class="btn btn-dark filter_button">Filter</button>
</div>
</div>
</form>
</form>
</div>
</div>

{% if ungm_published_today %}
<ul>
Expand Down

0 comments on commit 7df901a

Please sign in to comment.