Skip to content

Commit

Permalink
Move autodetect and clear to top and change rule to advanced
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinayak-mehta
vinayak-mehta committed Nov 20, 2018
1 parent 6d0648e commit 00ac940
Show file tree
Hide file tree
Showing 21 changed files with 4,323 additions and 75 deletions.
5 changes: 5 additions & 0 deletions excalibur/www/static/css/vendor/fontawesome.css
View file

Large diffs are not rendered by default.

Binary file added excalibur/www/static/css/webfonts/fa-brands-400.eot
View file
Binary file not shown.
1,184 changes: 1,184 additions & 0 deletions excalibur/www/static/css/webfonts/fa-brands-400.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added excalibur/www/static/css/webfonts/fa-brands-400.ttf
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-brands-400.woff
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-brands-400.woff2
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-regular-400.eot
View file
Binary file not shown.
467 changes: 467 additions & 0 deletions excalibur/www/static/css/webfonts/fa-regular-400.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added excalibur/www/static/css/webfonts/fa-regular-400.ttf
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-regular-400.woff
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-regular-400.woff2
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-solid-900.eot
View file
Binary file not shown.
2,618 changes: 2,618 additions & 0 deletions excalibur/www/static/css/webfonts/fa-solid-900.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added excalibur/www/static/css/webfonts/fa-solid-900.ttf
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-solid-900.woff
View file
Binary file not shown.
Binary file added excalibur/www/static/css/webfonts/fa-solid-900.woff2
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions excalibur/www/static/css/workspace.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ img {
margin: 0 auto;
}

div .control-panel {
background-color : #ffffff;
box-shadow : 0 0 6px #ffffff;
padding: 0;
}

div .image-area {
-moz-border-radius : 5px 5px 5px 5px;
-moz-box-shadow : 0 0 6px #c8c8c8;
Expand Down
5 changes: 5 additions & 0 deletions excalibur/www/static/js/vendor/popper.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions excalibur/www/static/js/workspace.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ const onFlavorChange = function () {
}
};

const onSavedRuleChange = function () {
const rule_id = document.getElementById('rules').value;
const onSavedRuleClick = function (e) {
const rule_id = e.getAttribute('data-rule-id');
$.ajax({
url: '/rules/{0}'.format(rule_id),
type: 'GET',
Expand Down
1 change: 1 addition & 0 deletions excalibur/www/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/jquery-3.3.1.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/popper.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/bootstrap.min.js') }}"></script>
{% block javascript %}{% endblock %}
</body>
Expand Down
108 changes: 35 additions & 73 deletions excalibur/www/templates/workspace.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% block stylesheet %}
<link rel="stylesheet" href="{{ url_for('static', filename='css/vendor/fontawesome.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/vendor/jquery.selectareas.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/vendor/jquery-ui.min.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/vendor/jquery-ui.theme.min.css') }}">
Expand All @@ -16,73 +17,58 @@ <h2>Workspace</h2>
</div>
</div>
<div class="row">
<div class="col-md-12 col-sm-12 pb-5">
<form>
<div class="form-group form-group__custom">
<label for="page-numbers"><b>Page numbers (comma separated)</b></label>
<div class="input-group">
<input type="text" class="form-control form-control-lg" aria-describedby="page-numbers-help" placeholder="Example: 1,5,8 or 3,6-end" autocomplete="false">
<div class="input-group-append">
<button type="button" onclick="startJob()" class="btn btn-success btn-lg">Extract</button>
</div>
<section class="col-md-2"></section>
<section class="col-md-8">
<div class="jumbotron control-panel">
<div class="btn-group">
<button id="select-rule" type="button" class="btn btn-info dropdown-toggle mr-2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Select Saved Rule</button>
<div class="dropdown-menu" aria-labelledby="select-rule">
<h6 class="dropdown-header">Saved Rules</h6>
{% for rule in saved_rules %}
<a class="dropdown-item" href="#" data-rule-id="{{ rule.rule_id }}" onclick="onSavedRuleClick(this)">{{ rule.rule_name }}</a>
{% endfor %}
</div>
<small id="page-numbers-help" class="form-text text-muted">Page numbers to extract tables from. By default, tables from only this page will be extracted.</small>
</div>
</form>
</div>
<button type="button" class="btn btn-secondary detect-areas mr-2" data-flavor="lattice" onclick="onDetectAreasClick(this)"><i class="fas fa-eye mr-2"></i>Autodetect Tables</button>
<button type="button" id="reset-areas" class="btn btn-secondary reset-areas mr-2" onclick="resetTableAreas()"><i class="fas fa-trash-alt mr-2"></i>Clear Selections</button>
</div>
</section>
<section class="col-md-2">
<button type="button" onclick="startJob()" class="btn btn-success"><i class="fas fa-table mr-2"></i>View and Download Data</button>
</section>
</div>
<div class="row">
<section class="col-md-3">
<div class="row mx-0 mb-3 card">
<div class="card-body">
<div class="card-title">
<h3>Saved Rules</h3>
</div>
<form class="form-group">
<div class="row py-3">
<div class="col-md-12">
<select class="form-control" name="rules" id="rules" onchange="onSavedRuleChange()">
<option value="" selected disabled>Select rule</option>
{{ rules }}
{% for rule in saved_rules %}
<option value="{{ rule.rule_id }}">{{ rule.rule_name }}</option>
{% endfor %}
</select>
</div>
<section class="col-md-2">
<!-- Add thumbnails and scrollspy -->
</section>
<section class="col-md-8">
<div class="jumbotron">
<div class="row mx-0">
<div class="col-md-12 col-sm-12 col-xs-12">
<div id="image-div">
<img src="{{ imagepath }}" id="image" class="image-area"/>
</div>
</form>
</div>
</div>
</div>
</section>
<section class="col-md-2">
<div class="row mx-0 mb-3 card">
<div class="card-body">
<div class="card-title">
<h3>Rule</h3>
<h5>Advanced</h5>
</div>
<form class="form-group">
<div class="row py-3">
<div class="col-md-12">
<label for="flavors">Extraction flavor</label>
<label for="flavors">Flavor</label>
<select class="form-control" name="flavors" id="flavors" onchange="onFlavorChange()">
<option selected disabled>Select flavor</option>
<option value="Lattice">Lattice</option>
<option value="Stream">Stream</option>
</select>
</div>
<div class="row mx-0 lattice mt-3" style="display: none">
<div class="col-md-12">
<div class="form-group">
<label>Table areas</label>
<small class="form-text text-muted">Detect table areas.</small>
<div class="row mt-1">
<div class="col-md-6">
<button type="button" class="btn btn-block btn-primary detect-areas" data-flavor="lattice" onclick="onDetectAreasClick(this)">Detect</button>
</div>
<div class="col-md-6">
<button type="button" id="reset-areas" class="btn btn-block btn-primary reset-areas" onclick="resetTableArea()">Clear</button>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="process-background">Process background</label>
Expand Down Expand Up @@ -113,25 +99,11 @@ <h3>Rule</h3>
</div>
</div>
<div class="row mx-0 stream mt-3" style="display: none">
<div class="col-md-12">
<div class="form-group">
<label>Table areas</label>
<small class="form-text text-muted">Detect table areas.</small>
<div class="row mt-1">
<div class="col-md-6">
<button type="button" class="btn btn-block btn-primary detect-areas" data-flavor="stream" onclick="onDetectAreasClick(this)">Detect</button>
</div>
<div class="col-md-6">
<button type="button" id="reset-areas" class="btn btn-block btn-primary reset-areas" onclick="resetTableArea()">Clear</button>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label>Columns</label>
<small class="form-text text-muted">Add column separators.</small>
<button type="button" id="add-separator" class="btn btn-block btn-primary add-separator mt-1" onclick="onAddSeparatorClick(this)">Add separator</button>
<small class="form-text text-muted">Add vertical cutters.</small>
<button type="button" id="add-separator" class="btn btn-block btn-primary add-separator mt-1" onclick="onAddSeparatorClick(this)">Add cutter</button>
</div>
</div>
<div class="col-md-12">
Expand Down Expand Up @@ -168,17 +140,6 @@ <h3>Rule</h3>
</div>
</div>
</section>
<section class="col-md-9">
<div class="jumbotron">
<div class="row mx-0">
<div class="col-md-12 col-sm-12 col-xs-12">
<div id="image-div">
<img src="{{ imagepath }}" id="image" class="image-area"/>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
{% else %}
Expand All @@ -193,6 +154,7 @@ <h1 class="display-4">Refresh</h1>

{% block javascript %}
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/jquery.selectareas.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/jquery.selectareas.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/vendor/jquery-ui.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/workspace.js') }}"></script>
<script type="text/javascript">
Expand Down

0 comments on commit 00ac940

Please sign in to comment.