Feature/HebrewView

app/internal/hebrew_date_view.py

@@ -0,0 +1,67 @@
+from datetime import datetime
+
+from hebrew_numbers import int_to_gematria
+from pyluach import dates, hebrewcal
+
+
+EN_TO_HEB_MONTH_NAMES = {
+    'Tishrei': 'תשרי',
+    'Cheshvan': 'חשוון',
+    'Kislev': 'כסלו',
+    'Teves': 'טבת',
+    'Shvat': 'שבט',
+    'Adar': 'אדר',
+    'Adar Rishon': "אדר(א')",
+    'Adar Sheni': "אדר(ב')",
+    'Nissan': 'ניסן',
+    'Iyar': 'אייר',
+    'Sivan': 'סיוון',
+    'Tamuz': 'תמוז',
+    'Av': 'אב',
+    'Elul': 'אלול',
+}
+
+
+def get_month_name_by_num(date: datetime) -> str:
+    """Returns the Hebrew name date for the specific day.
+
+        Args:
+            date: The requested date.
+
+        Returns:
+            A Hebrew name date.
+    """
+    for month in hebrewcal.Year(date.year).itermonths():
+        if date.month == month.month:
+            return EN_TO_HEB_MONTH_NAMES[month.name]
+
+
+def from_greogian_to_hebrew_date(date: datetime) -> str:
+    """Returns the Hebrew date for the specific greogian date.
+
+    Args:
+        date: The requested date.
+
+    Returns:
+        A Hebrew date string.
+    """
+    gregorian_date = dates.GregorianDate(date.year, date.month, date.day)
+    return gregorian_date.to_heb()
+
+
+def get_hebrew_date_in_words(date: datetime) -> str:
+    """Returns the Hebrew date for the specific day.
+
+    Args:
+        date: The requested date.
+
+    Returns:
+        A Hebrew date string.
+    """
+
+    hebrew_date_object = from_greogian_to_hebrew_date(date)
+    return ' '.join((
+        int_to_gematria(hebrew_date_object.day),
+        get_month_name_by_num(hebrew_date_object),
+        int_to_gematria(hebrew_date_object.year % 1000)
+    ))

app/routers/audio.py

@@ -23,6 +23,7 @@
 )
 from app.internal.security.dependencies import current_user
 
+
 router = APIRouter(
     prefix="/audio",
     tags=["audio"],

app/routers/calendar.py

@@ -1,11 +1,12 @@
 from http import HTTPStatus
 
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends
 from fastapi.responses import HTMLResponse
 from starlette.responses import Response
 
-from app.dependencies import templates
-from app.routers import calendar_grid as cg
+from app.dependencies import get_db, templates
+from app.routers import calendar_grid
+
 
 router = APIRouter(
     prefix="/calendar/month",
@@ -16,16 +17,16 @@
 
 
 @router.get("/")
-async def calendar(request: Request) -> Response:
-    user_local_time = cg.Day.get_user_local_time()
-    day = cg.create_day(user_local_time)
+async def calendar(request: Request, db_session=Depends(get_db)) -> Response:
+    user_local_time = calendar_grid.Day.get_user_local_time()
+    day = calendar_grid.create_day(user_local_time)
     return templates.TemplateResponse(
         "calendar_monthly_view.html",
         {
             "request": request,
             "day": day,
-            "week_days": cg.Week.DAYS_OF_THE_WEEK,
-            "weeks_block": cg.get_month_block(day)
+            "week_days": calendar_grid.Week.DAYS_OF_THE_WEEK,
+            "weeks_block": calendar_grid.get_month_block(day),
         }
     )
 
@@ -34,8 +35,10 @@ async def calendar(request: Request) -> Response:
 async def update_calendar(
     request: Request, date: str, days: int
 ) -> HTMLResponse:
-    last_day = cg.Day.convert_str_to_date(date)
-    next_weeks = cg.create_weeks(cg.get_n_days(last_day, days))
+    last_day = calendar_grid.Day.convert_str_to_date(date)
+    next_weeks = calendar_grid.create_weeks(
+        calendar_grid.get_n_days(last_day, days)
+    )
     template = templates.get_template(
         'partials/calendar/monthly_view/add_week.html')
     content = template.render(weeks_block=next_weeks)

app/routers/dayview.py

@@ -6,7 +6,7 @@
 
 from app.database.models import Event, User
 from app.dependencies import get_db, templates
-from app.internal import international_days, zodiac
+from app.internal import hebrew_date_view, international_days, zodiac
 from app.routers.user import get_all_user_events
 
 router = APIRouter()
@@ -177,6 +177,7 @@ async def dayview(
     except ValueError as err:
         raise HTTPException(status_code=404, detail=f"{err}")
     zodiac_obj = zodiac.get_zodiac_of_day(session, day)
+    hebrew_obj = hebrew_date_view.get_hebrew_date_in_words(day.date())
     events_n_attrs = get_events_and_attributes(
         day=day,
         session=session,
@@ -200,5 +201,6 @@ async def dayview(
             "international_day": inter_day,
             "zodiac": zodiac_obj,
             "view": view,
+            "hebrew_view": hebrew_obj,
         },
     )

app/static/dayview.css

@@ -164,3 +164,24 @@ body {
   width: 1.2rem;
   height: 1.2rem;
 }
+
+.hebrew-dates {
+    position: absolute;
+    right: 1.2rem;
+    top: 5rem;
+    padding-right: var(--space_xs);
+    padding-left: var(--space_xs);
+    padding-bottom: var(--space_xxs);
+    border: solid 0.1px var(--primary);
+    background-color: var(--surface-variant);
+    box-shadow: 1px 1px 2px #999;
+    line-height: 1;
+    height: 3.5rem;
+    width: 3.5rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.8rem;
+    font-weight: bold;
+}
+

app/templates/calendar_day_view.html

@@ -14,82 +14,67 @@
               class="month-title fw-bold text-white">{{month}}</span>
         <span id="day-num" class="day-title fw-bold text-white">{{day}}</span>
         {% if zodiac %}
-        <div class="zodiac-sign">
-            <a href="https://www.horoscope.com/zodiac-signs/{{zodiac.name}}"
-               title="Zodiac-sign: {{zodiac.name}}"
-               target="_blank"><img
-                    src="{{ url_for('static', path='/images/zodiac/' + zodiac.name + '.svg') }}"
-                    alt="zodiac sign" width="14em" height="13em"></a>
-        </div>
-        {% endif %}
-        {% else %}
-        <span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
-        {% endif %}
+    <div class="zodiac-sign">
+      <a href="https://www.horoscope.com/zodiac-signs/{{zodiac.name}}" title="Zodiac-sign: {{zodiac.name}}"
+         target="_blank"><img src="{{ url_for('static', path='/images/zodiac/' + zodiac.name + '.svg') }}"
+                              alt="zodiac sign" width="14em" height="13em"></a>
     </div>
-    {% if international_day %}
-    <div class="international-days">
-        The International days are: "{{ international_day.international_day }}"
+        {% endif %}
+    {% if hebrew_view %}
+    <div class="hebrew-dates">
+        {{ hebrew_view }}
     </div>
     {% endif %}
-    <div class="all_day_events">
-        {% for event in all_day_events %}
-        <p class="text-truncate my-0 {{size}}">{{ event.title }}</p>
+    {% else %}
+    <span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
+    {% endif %}
+  </div>
+  <div class="schedule">
+    <div class="container times bg-primeary position">
+        {% for hour in range(25)%}
+          <div class='hour-block'>
+              <div class="row bg-transparent hour-mark">
+                  {% if view == 'day'%}
+                      {% set hour = hour|string() %}
+                      {{hour.zfill(2)}}:00
+                  {% endif %}
+              </div>
+              <div class="hour-bar row text-white border-bottom"></div>
+          </div>
         {% endfor %}
     </div>
-    <div class="schedule">
-        <div class="container times bg-primeary position">
-            {% for hour in range(25)%}
-            <div class='hour-block'>
-                <div class="row bg-transparent hour-mark">
-                    {% if view == 'day'%}
-                    {% set hour = hour|string() %}
-                    {{hour.zfill(2)}}:00
-                    {% endif %}
-                </div>
-                <div class="hour-bar row text-white border-bottom"></div>
-            </div>
-            {% endfor %}
+      <div class="event-grid">
+      {% for event, attr in events %}
+      <div id="event{{event.id}}" class="d-flex flex-column text-truncate px-2 event"
+           style="background-color: {{attr.color}}; grid-row: {{attr.grid_position}}; max-hight:1.5rem;">
+        <div class="d-flex flex-column justify-content-evenly event-details">
+          <p class="text-truncate my-0 {{attr.title_size_class}}">{{ event.title }}</p>
+          {% if attr.total_time_visible %}
+          <p class="total-time text-truncate fw-light my-0">{{attr.total_time}}</p>
+          {% endif %}
         </div>
-        <div class="event-grid">
-            {% for event, attr in events %}
-            <div id="event{{event.id}}"
-                 class="d-flex flex-column text-truncate px-2 event"
-                 style="background-color: {{attr.color}}; grid-row: {{attr.grid_position}}; max-hight:1.5rem;">
-                <div class="d-flex flex-column justify-content-evenly event-details">
-                    <p class="text-truncate my-0 {{attr.title_size_class}}">{{
-                        event.title }}</p>
-                    {% if attr.total_time_visible %}
-                    <p class="total-time text-truncate fw-light my-0">
-                        {{attr.total_time}}</p>
-                    {% endif %}
-                </div>
-                <div class="d-flex flex-row justify-content-around align-items-end action-container"
-                     style="grid-row: {{attr.grid_position}};">
-                    <a href="/edit/{{event.id}}" title="Edit event"
-                       class="action-icon"><img class="pb-1"
-                                                src="{{ url_for('static', path='/images/icons/pencil.svg')}}"></a>
-                    <a href="/delete/{{event.id}}" title="Delete event"
-                       class="action-icon"><img class="pb-1"
-                                                src="{{ url_for('static', path='/images/icons/trash-can.svg')}}"></a>
-                    <a href="/event/{{event.id}}" title="See full event"
-                       class="action-icon"><img class="pb-1"
-                                                src="{{ url_for('static', path='/images/icons/view.svg')}}"></a>
-                </div>
-            </div>
-            {% endfor %}
+          <div class="d-flex flex-row justify-content-around align-items-end action-container"
+             style="grid-row: {{attr.grid_position}};">
+          <a href="/edit/{{event.id}}" title="Edit event" class="action-icon"><img class="pb-1"
+                                                                                   src="{{ url_for('static', path='/images/icons/pencil.svg')}}"></a>
+          <a href="/delete/{{event.id}}" title="Delete event" class="action-icon"><img class="pb-1"
+                                                                                       src="{{ url_for('static', path='/images/icons/trash-can.svg')}}"></a>
+          <a href="/event/{{event.id}}" title="See full event" class="action-icon"><img class="pb-1"
+                                                                                        src="{{ url_for('static', path='/images/icons/view.svg')}}"></a>
         </div>
+      </div>
+      {% endfor %}
     </div>
-    {% if view == 'day'%}
-    <button title="Add Event" class="event-btn add-event-icon">
-        <ion-icon name="add"></ion-icon>
-    </button>
-    {% endif %}
+       </div>
+  {% if view == 'day'%}
+  <button title="Add Event" class="event-btn add-event-icon">
+    <ion-icon name="add"></ion-icon>
+  </button>
+  {% endif %}
 </div>
-{% if view == 'day'%}
-<div id="event_block"></div>{% endif %}
+{% if view == 'day'%}<div id="event_block"></div>{% endif %}
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
         crossorigin="anonymous"></script>
-<script type="text/javascript"
-        src="{{ url_for('static', path='/eventdisplay.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', path='/eventdisplay.js') }}"></script>
 {% endblock body %}

requirements.txt

@@ -55,6 +55,7 @@ google-auth-oauthlib==0.4.2
 googleapis-common-protos==1.52.0
 h11==0.12.0
 h2==4.0.0
+python-hebrew-numbers==0.2.3
 hiredis==1.1.0
 hpack==4.0.0
 httpcore==0.12.2
@@ -104,6 +105,7 @@ pycparser==2.20
 pydantic==1.7.3
 pyflakes==2.2.0
 PyJWT==2.0.0
+pyluach==1.2.1
 pyparsing==2.4.7
 pytest==6.2.1
 pytest-asyncio==0.12.0