Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

21: Add a field for the location of the fault #40

Merged
merged 5 commits into from
Oct 4, 2018
Merged

21: Add a field for the location of the fault #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8af1d39
Refactored form
kayjayB Oct 4, 2018
94d56ce
Form stylng
kayjayB Oct 4, 2018
a4f6408
Styling
kayjayB Oct 4, 2018
12b2f97
Refactor
kayjayB Oct 4, 2018
70832df
Created alert message on submit
kayjayB Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions public/css/landingPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,32 @@ text {
max-width: 15%;
}

.notesBoxWrapper {
padding: 10px;
.notesBoxWrapper,
.locationBox {
padding-top: 10px;
padding-bottom: 10px;
}

textarea {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
resize: none;
border: 1px solid black;
border-radius: 4px;
}

input {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 100%;
}

input[type=text] {
border: 1px solid black;
border-radius: 4px;
}

#textarea-wrapper textarea.vertical {
Expand All @@ -276,4 +293,19 @@ textarea {
display: flex;
justify-content: center;
align-items: center;
}

#selectedResource {
margin-bottom: 0px;
}

select {
width: 100%;
border-radius: 4px;
border: 1px solid black;
}

.selectContainer {
padding-top: 10px;
padding-bottom: 10px;
}
8 changes: 7 additions & 1 deletion public/scripts/reportWastage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ $(document).ready(function() {


function report() {

let notes = document.getElementById("notesBox").value;
let location = document.getElementById("location").value = "";
document.getElementById("notesBox").value = "";
document.getElementById("location").value = "";
let alertString = "Your report has been recorded.\n" + "Resource type: " + resourceName + ".\n Location: " + location + ".\n Description: " + notes + ".";
alert(alertString);
}

function cancel() {
document.getElementById("notesBox").value = "";
document.getElementById("location").value = "";
}

function resources() {
Expand Down
8 changes: 4 additions & 4 deletions views/landingPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/cdn/css/bootstrap.css">
<link rel="stylesheet" href="/cdn/css/landingPage.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="/cdn/libraries/jquery.js"></script>
<script src="/cdn/libraries/bootstrap.min.js"></script>
<script src="/cdn/libraries/d3.min.js"></script>
Expand All @@ -17,12 +17,12 @@

<body>
<nav class="navbar navbar-default navbar-expand-md fixed-top">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>
<a class="navbar-brand" href="#">
<span class="site-title menu-collapsed">ENERGY VISUALISATIONS</span>
</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>

<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
Expand Down
42 changes: 32 additions & 10 deletions views/reportWastage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/cdn/css/bootstrap.css">
<link rel="stylesheet" href="/cdn/css/landingPage.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="/cdn/libraries/jquery.js"></script>
<script src="/cdn/libraries/bootstrap.min.js"></script>
<script src="/cdn/libraries/d3.min.js"></script>
Expand All @@ -16,12 +16,12 @@

<body>
<nav class="navbar navbar-default navbar-expand-md fixed-top">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>
<a class="navbar-brand" href="/">
<span class="site-title menu-collapsed">ENERGY VISUALISATIONS</span>
</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>

<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
Expand Down Expand Up @@ -95,25 +95,47 @@ <h2 style="padding-bottom: 30px; text-align: center">Report Resource Wastage</h2
</div>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-3 container2">
<p id="selectedResource">Type of Wastage</p>
<div class="col-sm-6">
<p id="selectedResource"><b>Resource Type</b></p>
</div>
<div class="col-sm-3 container2">
<div class="col-sm-3"></div>
</div>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-6 container2 selectContainer">
<select>
<option selected hidden>Choose Type</option>
<option value="Water">Water</option>
<option value="Electricity">Electricity</option>
<option value="Other">Other</option>
</select>
</div>

<div class="col-sm-3"></div>
</div>
<p></p>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-6">
<span>Description </span>
<span><b>Location</b></span>
</div>
<div class="col-sm-3"></div>
</div>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-6 container2 locationBox">
<input type="text" id="location" value=""> </input>
</div>
<div class="col-sm-3"></div>
</div>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-6">
<span><b>Description</b></span>
</div>
<div class="col-sm-3"></div>
</div>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-6">
<div class="notesBoxWrapper">
<textarea rows="5" cols="30" id="notesBox" placeholder=""></textarea>
</div>
Expand Down
10 changes: 5 additions & 5 deletions views/visualisation1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/cdn/css/bootstrap.css">
<link rel="stylesheet" href="/cdn/css/landingPage.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="/cdn/libraries/jquery.js"></script>
<script src="/cdn/libraries/bootstrap.min.js"></script>
<script src="/cdn/libraries/d3.min.js"></script>
Expand All @@ -17,17 +17,17 @@

<body>
<nav class="navbar navbar-default navbar-expand-md fixed-top">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>
<a class="navbar-brand" href="/">
<span class="site-title menu-collapsed">ENERGY VISUALISATIONS</span>
</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>

<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item dropdown d-sm-block d-md-none">
<a class="nav-link" href="#" id="smallerscreenmenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link active" href="#" id="smallerscreenmenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Compare Buildings
</a>
<a class="nav-link" href="/visualisation2" id="smallerscreenmenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down
8 changes: 4 additions & 4 deletions views/visualisation2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/cdn/css/bootstrap.css">
<link rel="stylesheet" href="/cdn/css/landingPage.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="/cdn/libraries/jquery.js"></script>
<script src="/cdn/libraries/bootstrap.min.js"></script>
<script src="/cdn/libraries/d3.min.js"></script>
Expand All @@ -17,12 +17,12 @@

<body>
<nav class="navbar navbar-default navbar-expand-md fixed-top">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>
<a class="navbar-brand" href="/">
<span class="site-title menu-collapsed">ENERGY VISUALISATIONS</span>
</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"><i class="fa fa-navicon"></i></span>
</button>

<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
Expand Down