Skip to content

merge feat -> main #6

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

Merged
eddiegulay merged 6 commits into from
Jul 30, 2025
Merged

merge feat -> main #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c864714
fix: url mismatch
jumarubea Jul 28, 2025
cffae38
feat: ai generation ui
jumarubea Jul 28, 2025
1a24be9
feat: ai generation
jumarubea Jul 30, 2025
75caba0
refactor: merges act
jumarubea Jul 30, 2025
a961365
Merge branch 'main' into feature/ai_generation
jumarubea Jul 30, 2025
918b1e7
merge feat -> main
jumarubea Jul 30, 2025
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
4 changes: 4 additions & 0 deletions logbook/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from django.test import TestCase

# Create your tests here.
from views import get_week_entries

w = get_week_entries(week_number=1)
print(w)
7 changes: 6 additions & 1 deletion logbook/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
operations_edit_view,
operations_delete_view,
update_activity_diagram,
get_week_entries,
)

urlpatterns = [
Expand Down Expand Up @@ -67,5 +68,9 @@
update_activity_diagram,
name="diagram_update",
),

path(
'week-entries/<int:week_number>/',
get_week_entries,
name='get_week_entries'
),
]
32 changes: 30 additions & 2 deletions logbook/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.shortcuts import render, redirect, HttpResponse
from django.urls import reverse
from django.http import JsonResponse
from home.views import process_login, logout
from .models import Student, Logbook, Entry, Week_operation, User
from datetime import datetime, timedelta
Expand Down Expand Up @@ -627,4 +627,32 @@ def update_activity_diagram(request, logbook_id):
'logbook': logbook,
}

return render(request, 'logbook/logbook_operations_diagram.html', context)
return render(request, 'logbook/logbook_operations_diagram.html', context)

def get_week_entries(request, week_number):
login_pass = is_allowed(request)
if login_pass is not True:
return login_pass

try:
student = Student.objects.get(user=request.user)
logbook = Logbook.objects.get(student=student, week_number=week_number)
except Student.DoesNotExist:
return JsonResponse({"error": "Student profile not found."}, status=404)
except Logbook.DoesNotExist:
return JsonResponse({"error": "Logbook not found."}, status=404)

days = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']
entries = []

for day in days:
try:
entry = Entry.objects.get(logbook=logbook, day=day)
entries.append({
'day': day,
'activity': entry.activity.strip()
})
except Entry.DoesNotExist:
continue

return JsonResponse(entries, safe=False)
229 changes: 159 additions & 70 deletions templates/logbook/logbook_entry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,189 @@
{% extends 'logbook/includes/base.html' %}
{% load static %}

<!-- main block -->
{% block main_block %}
<div class="wrapper">

<div class="main">
<div class="section">
<div class="container">
{% if form_errors %}
<div class="alert alert-danger alert-with-icon">
<button type="button" aria-hidden="true" class="close" data-dismiss="alert" aria-label="Close">
<i class="tim-icons icon-simple-remove"></i>
</button>
<span data-notify="icon" class="tim-icons icon-bell-55"></span>
<span>
<b> {{form_errors}} </span>
</div>
{% endif %}
<form class="row justify-content-between" method="post"> {% csrf_token %}

<div class="col-lg-6">
<div class="card card-plain">
<div class="card-body">
<h1 class="font-weight-light">Entry information</h1>
<div class="row">
<div class="col-sm-12">
<div class="datepicker-container">
<div class="form-group">
<label>Entry date: {{entry.date}}</label>
<input type="date" id="datepicker"
class="form-control datepicker rounded border border-warning" value="{{entry_date}}"
placeholder="Date" data-datepicker-color="Success" id="date_input" name="date_input" >
</div>
</div>
</div>
<div class="wrapper">
<div class="main">
<div class="section">
<div class="container">

{% if form_errors %}
<div class="alert alert-danger alert-with-icon">
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<i class="tim-icons icon-simple-remove"></i>
</button>
<span data-notify="icon" class="tim-icons icon-bell-55"></span>
<span><b>{{ form_errors }}</b></span>
</div>
{% endif %}

<form class="row justify-content-between" method="post">
{% csrf_token %}

<div class="col">
<!-- Left column -->
<div class="col-lg-6">
<div class="card card-plain">
<div class="card-body">
<h1 class="font-weight-light">Entry information</h1>
<div class="row">
<div class="col-sm-12">
<div class="datepicker-container">
<div class="form-group">
<label>Activity Summary</label>
<textarea class="form-control rounded border border-primary" value="{{entry.activity}}"
name="activity_summary" id="activity_summary" placeholder="Day activity details">{% if new_entry %}{{new_entry}}{% else %}{{entry.activity}}{% endif %}</textarea>
<label>Entry date: {{ entry.date }}</label>
<input type="date" id="date_input"
class="form-control datepicker rounded border border-warning"
value="{{ entry_date }}" name="date_input"
placeholder="Date" data-datepicker-color="Success">
</div>
</div>
</div>

<div class="col">
<div class="form-group">
<label>Activity Summary</label>
<textarea class="form-control rounded border border-primary"
name="activity_summary" id="activity_summary"
placeholder="Day activity details">{% if new_entry %}{{ new_entry }}{% else %}{{ entry.activity }}{% endif %}</textarea>
<button type="button" class="btn btn-secondary mt-2 float-right"
id="generateWithAI">Generate with AI</button>
</div>
</div>
</div>
</div>

</div>
</div>

<div class="col-lg-6">
<div class="card card-plain">
<div class="card-body">
<a href="/logbook/catalog/{{logbook.id}}/" class="btn btn-link btn-sm float-right text-light"><i class="tim-icons icon-minimal-left"></i> Back</a>
<h2 class="font-weight-light">Week - {{logbook.week_number}}<span class="px-2"></span>(
<div class="col-lg-6">
<div class="card card-plain">
<div class="card-body">
<a href="/logbook/catalog/{{ logbook.id }}/"
class="btn btn-link btn-sm float-right text-light">
<i class="tim-icons icon-minimal-left"></i> Back
</a>
<h2 class="font-weight-light">Week - {{ logbook.week_number }}
<span class="px-2"></span>(
{% if entry.date %}
{{entry.date}}
{{ entry.date }}
{% else %}
{{logbook.from_date}}
{% endif %})</h2>
<h4 class="text-light">Summarized Entry</h4>
<p class="text-white mt-4" id="summary">
Input the date using the provided calendar or by typing it in the correct format. Next, Describe your activities concisely and specifically. Optionally, add any additional information in that fields like "Notes" or "Comments." Review your input, and once satisfied, click "Save" to save the entry.
</p>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<span class="btn btn-neutral btn-sm float-left fade" rel="tooltip"
data-original-title="Regenerate summary"
data-placement="bottom">Regenerate</span>
{{ logbook.from_date }}
{% endif %})
</h2>
<h4 class="text-light">Summarized Entry</h4>
<p class="text-white mt-4" id="summary">
Input the date using the provided calendar or by typing it in the correct format.
Next, describe your activities concisely and specifically. Optionally, add any
additional information in fields like "Notes" or "Comments." Review your input, and
once satisfied, click "Save" to save the entry.
</p>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<span class="btn btn-neutral btn-sm float-left fade"
rel="tooltip" data-original-title="Regenerate summary"
data-placement="bottom">Regenerate</span>

<span type="submit" class="btn btn-default btn-sm float-left fade"
rel="tooltip" data-original-title="Use original content"
data-placement="bottom">original</span>
<span class="btn btn-default btn-sm float-left fade"
rel="tooltip" data-original-title="Use original content"
data-placement="bottom">Original</span>

<button type="submit" class="btn btn-success btn-round float-right"
rel="tooltip" data-original-title="save"
<button type="submit" class="btn btn-success btn-round float-right"
rel="tooltip" data-original-title="Save"
data-placement="bottom">Save</button>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</form>

<div class="modal fade" id="aiPromptModal" tabindex="-1" aria-labelledby="aiPromptModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="aiPromptModalLabel">Generate Activity Summary</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="ai_prompt">Describe what you did today:</label>
<textarea class="form-control" id="ai_prompt" rows="4"
placeholder="e.g., Attended team meeting, worked on project X, resolved issue Y"
style="color: #212529 !important; background-color: #fff !important;"></textarea>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="generateAIBtn">Generate</button>
</div>
</div>
</div>
</div>

</div>
</div>
</div>
</div>

<script>
document.addEventListener("DOMContentLoaded", function () {
const summaryInput = document.getElementById("activity_summary");
if (summaryInput) {
summaryInput.oninput = () => {
document.getElementById("summary").innerText = summaryInput.value;
};
}
});
</script>

<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<script>
$(document).ready(function () {
$('#generateWithAI').click(function () {
$('#aiPromptModal').modal('show');
});
$('#generateAIBtn').click(function () {
const userPrompt = $('#ai_prompt').val().trim();
if (!userPrompt) {
alert('Please describe what you did today.');
return;
}

const $button = $(this);
$button.prop('disabled', true).text('Generating...');

const systemMessage = "Write a summary entries in concise, past-tense sentences that provide clear and detailed descriptions of a day activities, focusing on what was accomplished, learned, and experienced during the a day. Maintain a formal and professional tone, using technical terminology as needed to accurately convey the tasks, tools, and outcomes. emphasizing the educational aspects of the training while also highlighting the practical outcomes achieved based on this user day activity done"

<!-- form manipulation -->
<script>
const summary_input = document.getElementById("activity_summary")
summary_input.oninput = ()=>{
document.getElementById("summary").innerHTML = summary_input.value
$.ajax({
url: 'https://jumarubea-logbook-ai-gen.hf.space/api/ai-generate',
method: 'POST',
contentType: 'application/json',
data: JSON.stringify({
system_message: systemMessage,
user_prompt: userPrompt
}),
success: function (response) {
console.log("AI Response:", response);
if (response.generated_text) {
$('#activity_summary').val(response.generated_text);
$('#aiPromptModal').modal('hide');
$('#ai_prompt').val('');
$('#summary').text(response.generated_text);
} else {
alert('Error: No generated text received from the API.');
}
},
error: function (xhr) {
console.error("AI Error:", xhr);
alert('Error generating summary: ' + (xhr.responseJSON?.error || xhr.responseText || 'Unknown error'));
},
complete: function () {
$button.prop('disabled', false).text('Generate');
}
</script>
});
});

{% endblock main_block %}
});
</script>
{% endblock main_block %}
1 change: 1 addition & 0 deletions templates/logbook/logbook_operations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ <h5 class="font-weight-light text-primary">Machinery</h5>
<div class="row mt-2">
<div class="col-12 text-right">
<a href="{% url 'operations_edit' logbook.id operation.id %}" class="text-primary btn btn-sm"> <i class="fa fa-edit"></i> Edit</a>

<a href="{% url 'operations_delete' logbook.id operation.id %}" class="btn text-danger btn-sm"><i class="fa fa-trash"></i> Dispose</a>
</div>
</div>
Expand Down
Loading