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.

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

My branch #26

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions sa3ed_app/api/CaseStatus.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import frappe

@frappe.whitelist()
def follow_up_case(case_id):

lost_person = frappe.db.get_value('Lost Person', {'name': case_id}, ['case_status'], as_dict=True)

if lost_person:
return {'case_status': lost_person['case_status']}


founded_person = frappe.db.get_value('Founded Person', {'name': case_id}, ['case_status'], as_dict=True)

if founded_person:
return {'case_status': founded_person['case_status']}

return {'error': 'Case not found'}
3 changes: 3 additions & 0 deletions sa3ed_app/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
web_include_css = "/assets/css/site.css"
web_include_js = "/assets/js/site.js"




# include custom scss in every website theme (without file extension ".scss")
# website_theme_scss = "sa3ed_app/public/scss/website"

Expand Down
11 changes: 10 additions & 1 deletion sa3ed_app/www/home/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ <h2 class="mt-1 mb-3">{{_('ساعد')}}</h2>
<br/>
</div>
</div>
<div class="row">
<div class="col text-center">
<a class="follow btn" href="search">
{{_('تحقق من حالة شخص')}}
<img src="/assets/img/foundhome.svg"/>
</a>
</div>
</div>

<div class="row">
<div class="col text-center">
<a class="follow btn" href="#">
Expand All @@ -44,4 +53,4 @@ <h2 class="mt-1 mb-3">{{_('ساعد')}}</h2>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
28 changes: 28 additions & 0 deletions sa3ed_app/www/search/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{% extends base_template_path %}
{% block content %}
<div class="container">
<div class="row justify-content-center">
<div class="col-md">
<img class="col-.75" src="/assets/img/found.svg" />
<h4>من فضلك أدخل رقم الحالة للتحقق من حالتها</h4>

<div class="row mt-5">
<div class="col-md">
<div>
<label for="caseID">رقم الحالة:</label>
<input type="text" id="caseID" class="form-control" placeholder="أدخل رقم الحالة">
</div>
<div class="mt-3">
<button class="btn btn-primary" id="SearchCaseButton" onclick="followUpCase()">تحقق من الحالة</button>
</div>

<div class="progress my-4" id="ProgressBar" style="width:20%;margin:auto" hidden>
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div>
</div>
<div id="statusMessage" class="mt-3"></div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
33 changes: 33 additions & 0 deletions sa3ed_app/www/search/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
function followUpCase() {
var caseID = document.getElementById('caseID').value;

if (!caseID) {
document.getElementById('statusMessage').innerHTML = '<p class="text-danger">من فضلك أدخل رقم الحالة.</p>';
return;
}

document.getElementById("SearchCaseButton").disabled = true;
document.getElementById("ProgressBar").hidden = false;

frappe.call({
method: 'sa3ed_app.api.CaseStatus.follow_up_case',
args: { case_id: caseID },
callback: function(response) {
document.getElementById("SearchCaseButton").disabled = false;
document.getElementById("ProgressBar").hidden = true;

if (response.message && response.message.case_status) {
document.getElementById('statusMessage').innerHTML = '<p class="text-success">الحالة: ' + response.message.case_status + '</p>';
} else if (response.message && response.message.error) {
document.getElementById('statusMessage').innerHTML = '<p class="text-danger">' + response.message.error + '</p>';
} else {
document.getElementById('statusMessage').innerHTML = '<p class="text-danger">لم يتم العثور على الحالة.</p>';
}
},
error: function(error) {
document.getElementById("SearchCaseButton").disabled = false;
document.getElementById("ProgressBar").hidden = true;
document.getElementById('statusMessage').innerHTML = '<p class="text-danger">حدث خطأ أثناء التحقق من الحالة.</p>';
}
});
}
13 changes: 13 additions & 0 deletions sa3ed_app/www/search/indext.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

#statusMessage p {
font-size: 1.2em;
margin-top: 10px;
}

.text-success {
color: green;
}

.text-danger {
color: red;
}