salim
/
newosinadjango
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New changes.

Browse Source
main
nataly 1 year ago
parent 10f56adcde
commit 7fd912e1d7
27 changed files with 306 additions and 36 deletions
Show Stats Download Patch File Download Diff File

BIN
osinaweb/db.sqlite3
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/views.cpython-311.pyc
View File

Binary file not shown.

9
osinaweb/osinacore/views.py
Unescape Escape View File

@ -516,6 +516,15 @@ def add_business_modal(request, *args, **kwargs):
return render(request, 'popup_modals/addbusiness-modal.html', context)
def add_user_story_modal(request):
context = {
}
return render(request, 'popup_modals/add-userstory-modal.html', context)
def staff_position_modal(request):
context = {

BIN
osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc
View File

Binary file not shown.

1
osinaweb/osinaweb/urls.py
Unescape Escape View File

@ -71,6 +71,7 @@ urlpatterns = [
path('add-status/', views.add_status_modal, name='addstatus'),
path('add-note/', views.add_note_modal, name='addnote'),
path('add-file/', views.add_file_modal, name='addfile'),
path('add-user-story/', views.add_user_story_modal, name='adduserstory'),
path('add-credentials/', views.add_credentials_modal, name='addcredentials'),
path('update-status/<str:task_id>/', views.update_status_modal, name='updatestatus'),
path('add-point/<str:task_id>/', views.add_point_modal, name='addpoint'),

16
osinaweb/static/dist/output.css vendored
Unescape Escape View File

@ -790,6 +790,10 @@ video {
margin-top: 0.5rem;
}
.mt-20 {
margin-top: 5rem;
}
.mt-3 {
margin-top: 0.75rem;
}
@ -874,6 +878,10 @@ video {
height: 150px;
}
.h-\[210px\] {
height: 210px;
}
.h-\[25px\] {
height: 25px;
}
@ -882,6 +890,10 @@ video {
height: 2px;
}
.h-\[305px\] {
height: 305px;
}
.h-\[30px\] {
height: 30px;
}
@ -910,6 +922,10 @@ video {
height: 60px;
}
.h-\[630px\] {
height: 630px;
}
.h-\[70px\] {
height: 70px;
}

2
osinaweb/static/js/pop-modals.js
Unescape Escape View File

@ -62,6 +62,8 @@ document.addEventListener("DOMContentLoaded", function () {
addButtonClickListener("usersActivityIcon", "400px", "600px");
addButtonClickListener("addStatusButtonMobile", "500px", "80px");
addButtonClickListener("userRecentActivitiesButton", "400px", "600px");
addButtonClickListener("addUserStoryButton", "400px", "180px");
// DELETE BUTTONS

13
osinaweb/templates/details_pages/business-details.html
Unescape Escape View File

@ -146,7 +146,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -154,6 +155,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/details_pages/customer-details.html
Unescape Escape View File

@ -248,7 +248,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -256,6 +257,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

17
osinaweb/templates/details_pages/project-details.html
Unescape Escape View File

@ -240,7 +240,7 @@
</div>
<button
class="h-full rounded-tr-md px-4 bg-gray-300 text-slate-700 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center">
class="h-full rounded-tr-md px-4 bg-gray-300 text-slate-700 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addUserStoryButton" data-modal-url="{% url 'adduserstory' %}">
<i class="fa fa-plus"></i>
</button>
</div>
@ -377,6 +377,7 @@
</div>
</div>
<!-- RELATED FILES -->
<div class="w-full mt-5">
<div class="overflow-x-auto border border-gray-300 rounded-md mt-5" id="customersContainer">
@ -444,7 +445,6 @@
</div>
<!-- TAGS -->
<div>
<p class="text-gray-500 text-xl mt-5">Tags:</p>
@ -522,7 +522,17 @@
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-fit rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -530,6 +540,7 @@
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/details_pages/staff-details.html
Unescape Escape View File

@ -138,7 +138,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -146,6 +147,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/details_pages/task-details.html
Unescape Escape View File

@ -357,7 +357,8 @@
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -365,6 +366,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

24
osinaweb/templates/epic-fetched-tasks.html
Unescape Escape View File

@ -15,6 +15,13 @@
</div>
<div class="grid grid-cols-3">
{% if task.status == 'Closed' %}
<div
class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-green-700">
<p>{{task.status}}</p>
</div>
{% endif %}
{% if task.status == 'Open' %}
<div
class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
@ -29,6 +36,15 @@
</div>
{% endif %}
{% if task.status == 'Closed' %}
<div
class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-green-700">
<p>{{task.formatted_start_date}}</p>
</div>
{% endif %}
{% if task.status == 'Open' %}
<div
class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
@ -43,6 +59,14 @@
</div>
{% endif %}
{% if task.status == 'Closed' %}
<div
class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">
<p>{{task.formatted_end_date}}</p>
</div>
{% endif %}
{% if task.status == 'Open' %}
<div
class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">

31
osinaweb/templates/index.html
Unescape Escape View File

@ -49,8 +49,8 @@
<div class="w-full hidden lg:grid grid-cols-3 xlg:grid-cols-6 gap-3">
{% for note in notes %}
<div class="h-[150px] shadow-sm p-5" style="background-color: {{note.color}}">
<p class="text-base text-slate-800">{{note.text}}</p>
<div class="shadow-sm p-5" style="background-color: {{note.color}}">
<p class="text-sm text-slate-800">{{note.text}}</p>
</div>
{% endfor %}
</div>
@ -62,23 +62,11 @@
<div class="swiper-slide">
<div class="w-full h-[150px] p-3 flex justify-start items-start"
style="background-color: {{note.color}}">
{{note.text}}
<p class="text-sm text-slate-800">{{note.text}}</p>
</div>
</div>
{% endfor %}
</div>
<!-- <div class="flex justify-center items-center gap-3 mt-5">
<div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
id="sliderLeft">
<i class="fa fa-angle-left"></i>
</div>
<div class="w-[35px] h-[35px] bg-slate-700 b rounded-md text-white flex justify-center items-center text-[18px] cursor-pointer z-10"
id="sliderRight">
<i class="fa fa-angle-right"></i>
</div>
</div> -->
</div>
</div>
</div>
@ -507,7 +495,17 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -515,6 +513,7 @@
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/business-types.html
Unescape Escape View File

@ -155,7 +155,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -163,6 +164,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/businesses.html
Unescape Escape View File

@ -185,7 +185,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -193,6 +194,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/customers.html
Unescape Escape View File

@ -193,7 +193,8 @@
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -201,6 +202,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/daily-reports.html
Unescape Escape View File

@ -155,7 +155,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -163,6 +164,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/project-types.html
Unescape Escape View File

@ -156,7 +156,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -164,6 +165,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/projects.html
Unescape Escape View File

@ -207,7 +207,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -215,6 +216,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/references.html
Unescape Escape View File

@ -165,7 +165,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -173,6 +174,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/staff-positions.html
Unescape Escape View File

@ -159,7 +159,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -167,6 +168,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/staffs.html
Unescape Escape View File

@ -167,7 +167,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -175,6 +176,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/tags.html
Unescape Escape View File

@ -158,7 +158,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -166,6 +167,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

13
osinaweb/templates/listing_pages/tasks.html
Unescape Escape View File

@ -463,7 +463,8 @@
</div>
<!-- RIGHT SIDE / USERS ACTIVITY -->
<div class="hidden xxlg1:block w-[25%] bg-white h-[800px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
{% if latest_statuses_time_ago %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[630px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
@ -471,6 +472,16 @@
</div>
</div>
{% else %}
<div class="hidden xxlg1:block w-[25%] bg-white h-[305px] overflow-y-auto overflow-hidden rounded-md shadow-md p-5">
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2" id="activitiesContainer">
{% include 'recent-activities.html' %}
</div>
</div>
{% endif %}
</div>
</div>

35
osinaweb/templates/popup_modals/add-userstory-modal.html
Unescape Escape View File

@ -0,0 +1,35 @@
{% load static %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Osina</title>
<link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
</head>
<body>
<form id="hiddenContent" method="POST" action="">
{% csrf_token %}
<h1 class="text-slate-800 text-2xl font-semibold text-center">Add User Story</h1>
<div class="w-full flex justify-center items-center">
<input name="project" type="text" value=""
class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
required>
<input name="content" type="text" placeholder="User Story"
class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
required>
</div>
<div class="w-full flex justify-center items-center mt-4">
<button type="submit"
class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button>
</div>
</form>
</body>
</html>

12
osinaweb/templates/recent-activities.html
Unescape Escape View File

@ -4,11 +4,13 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
{% if latest_statuses_time_ago %}
{% for latest in latest_statuses_time_ago %}
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2 cursor-pointer userRecentActivitiesButton" data-modal-url="{% url 'userrecentativities' latest.status.staff.user.id %}">
<div class="flex justify-start gap-2 cursor-pointer userRecentActivitiesButton"
data-modal-url="{% url 'userrecentativities' latest.status.staff.user.id %}">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{{latest.status.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover rounded-full">
@ -43,5 +45,11 @@
</div>
</div>
</div>
{% endfor %}
{% else %}
{% endfor %}
<div class="w-full h-[210px] flex justify-center items-center">
<p class="text-base text-gray-500 text-center">No statuses at the moment.</p>
</div>
{% endif %}
Write Preview
Loading…
Cancel
Save