ypdated the grpups page and upload

app.py

@@ -6,7 +6,7 @@ import subprocess
 from werkzeug.utils import secure_filename
 from functools import wraps
 from extensions import db, bcrypt, login_manager
-from models import User, Player, Content  # Import the models from models.py
+from models import User, Player, Content, Group  # Add Group to the imports
 from flask_login import login_user, logout_user, login_required, current_user
 
 app = Flask(__name__, instance_relative_config=True)
@@ -59,8 +59,9 @@ def convert_ppt_to_pdf(input_file, output_file):
 @login_required
 def dashboard():
     players = Player.query.all()
+    groups = Group.query.all()
     logo_exists = os.path.exists(os.path.join(app.config['UPLOAD_FOLDERLOGO'], 'logo.png'))
-    return render_template('dashboard.html', players=players, logo_exists=logo_exists)
+    return render_template('dashboard.html', players=players, groups=groups, logo_exists=logo_exists)
 
 @app.route('/register', methods=['GET', 'POST'])
 def register():
@@ -112,33 +113,13 @@ def upload_content():
             file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename)
             file.save(file_path)
 
-            if media_type == 'pdf':
-                # Convert PDF to PNG
-                images = convert_from_path(file_path)
-                for i, image in enumerate(images):
-                    image_filename = f"{os.path.splitext(filename)[0]}_page_{i + 1}.png"
-                    image_path = os.path.join(app.config['UPLOAD_FOLDER'], image_filename)
-                    image.save(image_path, 'PNG')
-                    new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None)
+            if target_type == 'group':
+                group = Group.query.get_or_404(target_id)
+                for player in group.players:
+                    new_content = Content(file_name=filename, duration=duration, player_id=player.id)
                     db.session.add(new_content)
-                os.remove(file_path)  # Remove the original PDF file
-            elif media_type == 'ppt':
-                # Convert PPT/PPTX to PDF
-                pdf_filename = f"{os.path.splitext(filename)[0]}.pdf"
-                pdf_path = os.path.join(app.config['UPLOAD_FOLDER'], pdf_filename)
-                convert_ppt_to_pdf(file_path, pdf_path)
-                # Convert PDF to PNG
-                images = convert_from_path(pdf_path)
-                for i, image in enumerate(images):
-                    image_filename = f"{os.path.splitext(filename)[0]}_page_{i + 1}.png"
-                    image_path = os.path.join(app.config['UPLOAD_FOLDER'], image_filename)
-                    image.save(image_path, 'PNG')
-                    new_content = Content(file_name=image_filename, duration=duration, player_id=target_id if target_type == 'player' else None)
-                    db.session.add(new_content)
-                os.remove(file_path)  # Remove the original PPT/PPTX file
-                os.remove(pdf_path)  # Remove the intermediate PDF file
-            else:
-                new_content = Content(file_name=filename, duration=duration, player_id=target_id if target_type == 'player' else None)
+            elif target_type == 'player':
+                new_content = Content(file_name=filename, duration=duration, player_id=target_id)
                 db.session.add(new_content)
         
         db.session.commit()
@@ -147,8 +128,12 @@ def upload_content():
     target_type = request.args.get('target_type')
     target_id = request.args.get('target_id')
     return_url = request.args.get('return_url', url_for('dashboard'))
-    players = Player.query.all()
-    return render_template('upload_content.html', target_type=target_type, target_id=target_id, players=players, return_url=return_url)
+
+    # Serialize players and groups into JSON-serializable dictionaries
+    players = [{'id': player.id, 'username': player.username} for player in Player.query.filter(~Player.groups.any()).all()]
+    groups = [{'id': group.id, 'name': group.name} for group in Group.query.all()]
+
+    return render_template('upload_content.html', target_type=target_type, target_id=target_id, players=players, groups=groups, return_url=return_url)
 
 @app.route('/admin')
 @login_required
@@ -417,6 +402,62 @@ def inject_theme():
         theme = 'light'
     return dict(theme=theme)
 
+@app.route('/group/create', methods=['GET', 'POST'])
+@login_required
+@admin_required
+def create_group():
+    if request.method == 'POST':
+        group_name = request.form['name']
+        player_ids = request.form.getlist('players')
+        new_group = Group(name=group_name)
+        for player_id in player_ids:
+            player = Player.query.get(player_id)
+            if player:
+                new_group.players.append(player)
+        db.session.add(new_group)
+        db.session.commit()
+        return redirect(url_for('dashboard'))
+    players = Player.query.all()
+    return render_template('create_group.html', players=players)
+
+@app.route('/group/<int:group_id>/manage')
+@login_required
+@admin_required
+def manage_group(group_id):
+    group = Group.query.get_or_404(group_id)
+    content = Content.query.filter(Content.player_id.in_([player.id for player in group.players])).all()
+    return render_template('manage_group.html', group=group, content=content)
+
+@app.route('/group/<int:group_id>/edit', methods=['GET', 'POST'])
+@login_required
+@admin_required
+def edit_group(group_id):
+    group = Group.query.get_or_404(group_id)
+    if request.method == 'POST':
+        group.name = request.form['name']
+        player_ids = request.form.getlist('players')
+        group.players = [Player.query.get(player_id) for player_id in player_ids if Player.query.get(player_id)]
+        db.session.commit()
+        return redirect(url_for('dashboard'))
+    players = Player.query.all()
+    return render_template('edit_group.html', group=group, players=players)
+
+@app.route('/group/<int:group_id>/delete', methods=['POST'])
+@login_required
+@admin_required
+def delete_group(group_id):
+    group = Group.query.get_or_404(group_id)
+    db.session.delete(group)
+    db.session.commit()
+    return redirect(url_for('dashboard'))
+
+@app.route('/group/<int:group_id>/fullscreen', methods=['GET'])
+@login_required
+def group_fullscreen(group_id):
+    group = Group.query.get_or_404(group_id)
+    content = Content.query.filter(Content.player_id.in_([player.id for player in group.players])).all()
+    return render_template('group_fullscreen.html', group=group, content=content)
+
 if __name__ == '__main__':
     with app.app_context():
         db.create_all()  # Creează toate tabelele

models.py

@@ -48,4 +48,15 @@ class User(db.Model, UserMixin):
     def get_id(self):
         return str(self.id)
 
+class Group(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(100), nullable=False, unique=True)
+    players = db.relationship('Player', secondary='group_player', backref='groups')
+
+# Association table for many-to-many relationship between Group and Player
+group_player = db.Table('group_player',
+    db.Column('group_id', db.Integer, db.ForeignKey('group.id'), primary_key=True),
+    db.Column('player_id', db.Integer, db.ForeignKey('player.id'), primary_key=True)
+)
+
 # other models...

templates/create_group.html

@@ -0,0 +1,15 @@
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Group Name</label>
+        <input type="text" class="form-control" id="name" name="name" required>
+    </div>
+    <div class="mb-3">
+        <label for="players" class="form-label">Select Players</label>
+        <select multiple class="form-control" id="players" name="players">
+            {% for player in players %}
+                <option value="{{ player.id }}">{{ player.username }}</option>
+            {% endfor %}
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Create Group</button>
+</form>

templates/dashboard.html

@@ -69,6 +69,35 @@
                     </div>
                 </div>
 
+                <!-- Group of Players Section -->
+                <div class="card mb-4 {{ 'dark-mode' if theme == 'dark' else '' }}">
+                    <div class="card-header bg-secondary text-white">
+                        <h2>Group of Players</h2>
+                    </div>
+                    <div class="card-body">
+                        <ul class="list-group">
+                            {% for group in groups %}
+                                <li class="list-group-item d-flex justify-content-between align-items-center">
+                                    <div>
+                                        <strong>{{ group.name }}</strong>
+                                    </div>
+                                    <div>
+                                        <a href="{{ url_for('manage_group', group_id=group.id) }}" class="btn btn-sm btn-secondary">Manage Group</a>
+                                        <a href="{{ url_for('edit_group', group_id=group.id) }}" class="btn btn-sm btn-secondary">Edit Group</a>
+                                        <a href="{{ url_for('group_fullscreen', group_id=group.id) }}" class="btn btn-sm btn-primary">Full Screen</a>
+                                        <form action="{{ url_for('delete_group', group_id=group.id) }}" method="post" style="display:inline;">
+                                            <button type="submit" class="btn btn-sm btn-danger" onclick="return confirm('Are you sure you want to delete this group?');">Delete</button>
+                                        </form>
+                                    </div>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                        <div class="mt-3">
+                            <a href="{{ url_for('create_group') }}" class="btn btn-success">Create Group</a>
+                        </div>
+                    </div>
+                </div>
+
                 <!-- Content Upload Section -->
                 <div class="card mb-4 {{ 'dark-mode' if theme == 'dark' else '' }}">
                     <div class="card-header bg-warning text-dark">

templates/edit_group.html

@@ -0,0 +1,15 @@
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Group Name</label>
+        <input type="text" class="form-control" id="name" name="name" value="{{ group.name }}" required>
+    </div>
+    <div class="mb-3">
+        <label for="players" class="form-label">Select Players</label>
+        <select multiple class="form-control" id="players" name="players">
+            {% for player in players %}
+                <option value="{{ player.id }}" {% if player in group.players %}selected{% endif %}>{{ player.username }}</option>
+            {% endfor %}
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Save Changes</button>
+</form>

templates/manage_group.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Manage Group</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body class="{{ 'dark-mode' if theme == 'dark' else '' }}">
+    <div class="container py-5">
+        <h1 class="text-center mb-4">Manage Group: {{ group.name }}</h1>
+
+        <!-- Group Information Card -->
+        <div class="card mb-4 {{ 'dark-mode' if theme == 'dark' else '' }}">
+            <div class="card-header bg-info text-white">
+                <h2>Group Info</h2>
+            </div>
+            <div class="card-body">
+                <p><strong>Group Name:</strong> {{ group.name }}</p>
+                <p><strong>Number of Players:</strong> {{ group.players|length }}</p>
+            </div>
+        </div>
+
+        <!-- List of Players in the Group -->
+        <div class="card mb-4 {{ 'dark-mode' if theme == 'dark' else '' }}">
+            <div class="card-header bg-secondary text-white">
+                <h2>Players in Group</h2>
+            </div>
+            <div class="card-body">
+                <ul class="list-group">
+                    {% for player in group.players %}
+                        <li class="list-group-item d-flex justify-content-between align-items-center">
+                            <div>
+                                <strong>{{ player.username }}</strong> ({{ player.hostname }})
+                            </div>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+
+        <!-- Manage Media Section -->
+        <div class="card mb-4 {{ 'dark-mode' if theme == 'dark' else '' }}">
+            <div class="card-header bg-info text-white">
+                <h2>Manage Media</h2>
+            </div>
+            <div class="card-body">
+                {% if content %}
+                    <ul class="list-group">
+                        {% for media in content %}
+                            <li class="list-group-item d-flex align-items-center {{ 'dark-mode' if theme == 'dark' else '' }}">
+                                <div class="flex-grow-1">
+                                    <p class="mb-0"><strong>Media Name:</strong> {{ media.file_name }}</p>
+                                </div>
+                                <form action="{{ url_for('edit_content', content_id=media.id) }}" method="post" class="d-flex align-items-center">
+                                    <div class="input-group me-2">
+                                        <span class="input-group-text">seconds</span>
+                                        <input type="number" class="form-control {{ 'dark-mode' if theme == 'dark' else '' }}" name="duration" value="{{ media.duration }}" required>
+                                    </div>
+                                    <button type="submit" class="btn btn-warning me-2">Edit</button>
+                                </form>
+                                <form action="{{ url_for('delete_content', content_id=media.id) }}" method="post" style="display:inline;">
+                                    <button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this media?');">Delete</button>
+                                </form>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    <p class="text-center">No media uploaded for this group.</p>
+                {% endif %}
+            </div>
+        </div>
+
+        <!-- Upload Media Button -->
+        <div class="text-center mb-4">
+            <a href="{{ url_for('upload_content', target_type='group', target_id=group.id, return_url=url_for('manage_group', group_id=group.id)) }}" class="btn btn-primary btn-lg">Go to Upload Media</a>
+        </div>
+
+        <!-- Back to Dashboard Button -->
+        <a href="{{ url_for('dashboard') }}" class="btn btn-secondary">Back to Dashboard</a>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"></script>
+</body>
+</html>

templates/player_page.html

@@ -69,12 +69,12 @@
                                 <form action="{{ url_for('edit_content', content_id=media.id) }}" method="post" class="d-flex align-items-center">
                                     <div class="input-group me-2">
                                         <span class="input-group-text">seconds</span>
-                                        <input type="number" class="form-control {% if theme == 'dark' %}dark-mode{% endif %}" name="duration" value="{{ media.duration }}" required>
+                                        <input type="number" class="form-control {% if theme == 'dark' %}dark-mode{% endif %}" name="duration" value="{{ media.duration }}" {% if player.groups %}disabled{% endif %} required>
                                     </div>
-                                    <button type="submit" class="btn btn-warning me-2">Edit</button>
+                                    <button type="submit" class="btn btn-warning me-2" {% if player.groups %}disabled{% endif %}>Edit</button>
                                 </form>
                                 <form action="{{ url_for('delete_content', content_id=media.id) }}" method="post" style="display:inline;">
-                                    <button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this media?');">Delete</button>
+                                    <button type="submit" class="btn btn-danger" {% if player.groups %}disabled{% endif %} onclick="return confirm('Are you sure you want to delete this media?');">Delete</button>
                                 </form>
                             </li>
                         {% endfor %}
@@ -86,9 +86,14 @@
         </div>
         {% endif %}
 
+        <!-- Action Buttons -->
         <a href="{{ url_for('dashboard') }}" class="btn btn-secondary">Back to Dashboard</a>
         <a href="{{ url_for('player_fullscreen', player_id=player.id) }}" class="btn btn-primary">Full Screen</a>
-        <a href="{{ url_for('upload_content', target_type='player', target_id=player.id, return_url=url_for('player_page', player_id=player.id)) }}" class="btn btn-success">Upload Media</a>
+        <a href="{{ url_for('upload_content', target_type='player', target_id=player.id, return_url=url_for('player_page', player_id=player.id)) }}" 
+           class="btn btn-success" 
+           {% if player.groups %}disabled onclick="return false;"{% endif %}>
+           {% if player.groups %}Manage Media by Group{% else %}Upload Media{% endif %}
+        </a>
     </div>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"></script>
 </body>

templates/upload_content.html

@@ -45,7 +45,7 @@
             <input type="hidden" name="return_url" value="{{ return_url }}">
             <div class="mb-3">
                 <label for="target_type" class="form-label">Target Type:</label>
-                <select name="target_type" id="target_type" class="form-select" required {% if target_type %}disabled{% endif %}>
+                <select name="target_type" id="target_type" class="form-select" required {% if target_type %}disabled{% endif %} onchange="updateTargetIdOptions()">
                     <option value="player" {% if target_type == 'player' %}selected{% endif %}>Player</option>
                     <option value="group" {% if target_type == 'group' %}selected{% endif %}>Group</option>
                 </select>
@@ -56,16 +56,19 @@
             <div class="mb-3">
                 <label for="target_id" class="form-label">Target ID:</label>
                 <select name="target_id" id="target_id" class="form-select" required {% if target_id %}disabled{% endif %}>
-                    <optgroup label="Players">
-                        {% for player in players %}
-                            <option value="{{ player.id }}" {% if target_type == 'player' and target_id == player.id %}selected{% endif %}>{{ player.username }}</option>
-                        {% endfor %}
-                    </optgroup>
-                    <optgroup label="Groups">
-                        {% for group in groups %}
-                            <option value="{{ group.id }}" {% if target_type == 'group' and target_id == group.id %}selected{% endif %}>{{ group.name }}</option>
-                        {% endfor %}
-                    </optgroup>
+                    {% if target_type == 'player' %}
+                        <optgroup label="Players">
+                            {% for player in players %}
+                                <option value="{{ player.id }}" {% if target_id == player.id %}selected{% endif %}>{{ player.username }}</option>
+                            {% endfor %}
+                        </optgroup>
+                    {% elif target_type == 'group' %}
+                        <optgroup label="Groups">
+                            {% for group in groups %}
+                                <option value="{{ group.id }}" {% if target_id == group.id %}selected{% endif %}>{{ group.name }}</option>
+                            {% endfor %}
+                        </optgroup>
+                    {% endif %}
                 </select>
                 {% if target_id %}
                     <input type="hidden" name="target_id" value="{{ target_id }}">
@@ -98,6 +101,36 @@
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"></script>
     <script>
+        function updateTargetIdOptions() {
+            const targetType = document.getElementById('target_type').value;
+            const targetIdSelect = document.getElementById('target_id');
+            targetIdSelect.innerHTML = ''; // Clear existing options
+
+            if (targetType === 'player') {
+                const players = {{ players|tojson }};
+                const optgroup = document.createElement('optgroup');
+                optgroup.label = 'Players';
+                players.forEach(player => {
+                    const option = document.createElement('option');
+                    option.value = player.id;
+                    option.textContent = player.username;
+                    optgroup.appendChild(option);
+                });
+                targetIdSelect.appendChild(optgroup);
+            } else if (targetType === 'group') {
+                const groups = {{ groups|tojson }};
+                const optgroup = document.createElement('optgroup');
+                optgroup.label = 'Groups';
+                groups.forEach(group => {
+                    const option = document.createElement('option');
+                    option.value = group.id;
+                    option.textContent = group.name;
+                    optgroup.appendChild(option);
+                });
+                targetIdSelect.appendChild(optgroup);
+            }
+        }
+
         document.getElementById('files').addEventListener('change', function(event) {
             const files = event.target.files;
             const mediaType = document.getElementById('media_type').value;