Stab virtual jabog32 patch 1

.github/deploy-test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# change directory to project
+cd /home/fpt/www-test/
+
+#Stop service
+sudo systemctl stop fpt-test
+
+#Update source code from repo
+export GIT_ASK_YESNO=false
+git reset --hard HEAD
+git pull --force -r
+
+#Start service again
+sudo systemctl start fpt-test

.github/deploy.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# change directory to project
+cd /home/fpt/www/
+
+#Stop service
+sudo systemctl stop fpt
+
+#Update source code from repo
+export GIT_ASK_YESNO=false
+git reset --hard HEAD
+git pull --force -r
+
+#Start service again
+sudo systemctl start fpt

.github/workflows/main.yml

@@ -0,0 +1,25 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup ssh key
+        run: |
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > .github/fpt_id_rsa
+          chmod 600 .github/fpt_id_rsa
+
+      - name: deploy fpt
+        run: ssh -o BatchMode=yes -o StrictHostKeyChecking=no -i .github/fpt_id_rsa "${{ secrets.SSH_USERNAME }}"@virtual-jabog32.de 'bash -s' < .github/deploy.sh

.github/workflows/test.yml

@@ -0,0 +1,25 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI-Test
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ deploy-test ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: setup ssh key
+        run: |
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > .github/fpt_id_rsa
+          chmod 600 .github/fpt_id_rsa
+
+      - name: deploy fpt
+        run: ssh -o BatchMode=yes -o StrictHostKeyChecking=no -i .github/fpt_id_rsa "${{ secrets.SSH_USERNAME }}"@virtual-jabog32.de 'bash -s' < .github/deploy-test.sh

.gitignore

@@ -36,3 +36,4 @@ yarn-debug.log*
 .yarn-integrity
 /.idea/
 /fpt.iml
+.vscode/settings.json

README.md

@@ -1,24 +1,157 @@
-# README
+# Flight Planning Tool (FPT) for DCS Squadron
+##Overview
+**The Flight Planning Tool (FPT)** is a vJaBoG32 specific Fork of ```/obfuscoder/fpt``` is a Ruby on Rails web application designed for virtual squadrons in the DCS (Digital Combat Simulator) environment. This tool allows pilots and air traffic controllers (ATCs) to manage flight plans, share them with ATC, and export relevant data to LUA files for DCS mods (e.g., Kneeboards, Waypoints). The app integrates with DCS to enhance mission planning and execution, providing centralized management of flights and their associated data.
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+## Features
+- Flight Plan Management: Create, edit, and view flight plans.
+- ATC Visibility: Allows ATCs to view and manage flight information in real-time.
+- LUA Export: Exports flight plans and waypoints into LUA format for easy integration with DCS mods (Kneeboard).
+- Integration with DCS: Seamless export and sharing of relevant flight data between the web app and DCS.
+- Approach Charts: Hosts PDFs (located in /public) with approach charts to assist pilots.
 
-Things you may want to cover:
+## Prerequisites
+Before setting up the application, ensure that the following tools and dependencies are installed:
+- Ruby (version specified in .ruby-version)
+- Rails (version specified in Gemfile)
+- PostgreSQL or other supported database
+- Node.js and Yarn (for handling JavaScript and CSS assets)
 
-* Ruby version
+See further information below, how to install prerequisites.
 
-* System dependencies
+## Setup
+### 1. Clone the Repository
+```bash
+git clone https://github.com/stab-virtual-jabog32/fpt
+```
 
-* Configuration
+### 2. Install Dependencies
+Run the following command to install required gems:
+```bash
+bundle install
+```
+For JavaScript and CSS dependencies, use:
+```bash
+yarn install
+```
 
-* Database creation
+### 3. Database Setup 
+Ensure that your PostgreSQL server is running and then create and migrate the database:
+```bash
+rails db:create
+rails db:migrate
+```
 
-* Database initialization
+### 4. Start the Rails Server
+To run the application locally, use:
+```bash
+rails server
+```
 
-* How to run the test suite
+## 1. Install Ruby
+It’s recommended to use a version manager like rbenv to install Ruby, as it allows you to manage different Ruby versions easily.
 
-* Services (job queues, cache servers, search engines, etc.)
+Using <rbenv>:
+**Step 1: Install <rbenv> and <ruby-build>**
+```bash
+# Install rbenv and ruby-build
+sudo apt update
+sudo apt install -y rbenv build-essential libssl-dev libreadline-dev zlib1g-dev
 
-* Deployment instructions
+# Set up rbenv
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+source ~/.bashrc
 
-* ...
+# Install ruby-build to easily install Ruby versions
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+```
+
+
+**Step 2: Install Ruby (version specified in <.ruby-version>)**
+```bash
+# Install Ruby (use the version from .ruby-version file)
+rbenv install <ruby-version>
+rbenv global <ruby-version>
+
+# Verify the installation
+ruby -v
+```
+
+**Step 3: Install Rails**
+Once Ruby is installed, you can install Rails using the gem package manager:
+```bash
+# Install Rails
+gem install rails -v <rails-version>
+
+# Verify the installation
+rails -v
+```
+
+Make sure the Rails version is compatible with the one specified in the Gemfile.
+
+
+**Step 4: Install PostgreSQL**
+PostgreSQL is the recommended database for this application. Use the following commands to install and set it up:stall Rails using the gem package manager:
+```bash
+# Update package list
+sudo apt update
+
+# Install PostgreSQL
+sudo apt install postgresql postgresql-contrib libpq-dev
+
+# Start the PostgreSQL service
+sudo service postgresql start
+```
+
+Once PostgreSQL is installed, you will need to create a user that matches your Linux username:
+```bash
+# Switch to the PostgreSQL shell
+sudo -u postgres psql
+
+# Create a user (replace 'your_username' with your Linux username)
+CREATE USER your_username WITH SUPERUSER PASSWORD 'your_password';
+
+# Exit the PostgreSQL shell
+\q
+```
+
+You can modify the database settings in <config/database.yml> to use this user.
+
+After configuring the user and the database, create the database:
+```bash
+rails db:create
+rails db:migrate
+```
+
+**Step 5: Install Yarn**
+Yarn is used to manage front-end dependencies (JavaScript libraries). It’s required for handling Rails assets like CSS and JS.
+```bash
+# Add Yarn package repository
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+
+# Update package list and install Yarn
+sudo apt update
+sudo apt install yarn
+
+# Verify installation
+yarn -v
+```
+
+**Step 6: Install Application Dependencies**
+Now that the system is ready, install the required gems and JavaScript dependencies for the application
+```bash
+# Install Ruby dependencies (gems)
+bundle install
+
+# Install JavaScript/CSS dependencies
+yarn install
+```
+
+**Step 7: Start the Rails Server**
+Once all dependencies are installed, start the Rails server with the following command:
+```bash
+rails server
+```
+
+The server will be available at <http://localhost:3000>.

app/views/flights/_form.html.haml

@@ -111,7 +111,7 @@
                   %input(type='checkbox' name='flight[support][]' value="#{support.key}" checked)
                 - else
                   %input(type='checkbox' name='flight[support][]' value="#{support.key}")
-              .col-2= support.type
+              .col-2= support.airframe.present? ? "#{support.type} (#{support.airframe})" : support.type
               .col-2= support.callsign
               .col-1= support.comms
               .col-1= support.tacan

app/views/mdc/show.text.erb

@@ -3,8 +3,8 @@ mdc = {
     ["callsign"] = "<%= @flight.full_callsign %>",
     ["mission"] = "<%= @flight.mission %>",
     ["time"] = "<%= @flight.start.strftime('%d%H%M%^b%y') %>",
-    ["task"] = "<%= @flight.task %>",
-    ["ao"] = "<%= @flight.ao %>",
+    ["task"] = "<%= j(@flight.task) %>",
+    ["ao"] = "<%= j(@flight.ao) %>",
     ["frequency"] = "<%= @flight.frequency %>",
     ["departure"] = "<%= @flight.departure_name %>",
     ["recovery"] = "<%= @flight.recovery_name %>",
@@ -15,7 +15,7 @@ mdc = {
         },
         ["recovery"] = {
             ["ad"] = "<%= "#{@flight.theater}/#{@flight.land_airbase}/ad.png" if @flight.land_airbase %>",
-            ["procedure"] = "<%= "#{@flight.theater}/#{@flight.start_airbase}/recoveries/#{@flight.recovery}.png" if @flight.recovery %>",
+            ["procedure"] = "<%= "#{@flight.theater}/#{@flight.land_airbase}/recoveries/#{@flight.recovery}.png" if @flight.recovery %>",
         },
         ["divert"] = {
             ["ad"] = "<%= "#{@flight.theater}/#{@flight.divert_airbase}/ad.png" if @flight.divert_airbase %>",
@@ -117,7 +117,7 @@ mdc = {
   comms = 1.upto(4).map { |num| [num, @flight.send("radio#{num}")] }.select { |e| e.last.present? }
   unless comms.empty? %>
     <% comms.each do |c| %>
-        [<%= c.first %>] = "<%= c.last %>",
+        [<%= j(c.first) %>] = "<%= j(c.last) %>",
     <% end %>
 <% end %>
     },
@@ -127,6 +127,7 @@ mdc = {
 <% support.select { |s| s.type == 'TANKER' }.each do |t| %>
             {
                 ["callsign"] = "<%= t.callsign %>",
+                ["airframe"] = "<%= t.airframe %>",
                 ["tacan"] = "<%= t.tacan %>",
                 ["comms"] = "<%= t.comms %>",
                 ["altitude"] = "<%= t.altitude %>",
@@ -139,6 +140,7 @@ mdc = {
 <% support.select { |s| s.type == 'AWACS' }.each do |a| %>
             {
                 ["callsign"] = "<%= a.callsign %>",
+                ["airframe"] = "<%= a.airframe %>",
                 ["comms"] = "<%= a.comms %>",
                 ["altitude"] = "<%= a.altitude %>",
                 ["position"] = "<%= a.position %>",
@@ -166,8 +168,8 @@ mdc = {
             ["group_id"] = "<%= f.group_id %>",
             ["laser_mask"] = "<%= f.laser_mask %>",
             ["mission"] = "<%= f.mission %>",
-            ["ao"] = "<%= f.ao %>",
-            ["task"] = "<%= f.task %>",
+            ["ao"] = "<%= j(f.ao) %>",
+            ["task"] = "<%= j(f.task) %>",
         },
 <% end %>
     },
@@ -212,5 +214,5 @@ mdc = {
         },
 <% end %>
     },
-    ["notes"] = [===[<%= @flight.notes %>]===],
+    ["notes"] = [===[<%= j(@flight.notes) %>]===],
 }

config/deploy.rb

@@ -2,7 +2,7 @@
 lock "~> 3.16.0"
 
 set :application, "fpt"
-set :repo_url, "https://github.com/obfuscoder/fpt.git"
+set :repo_url, "https://github.com/stab-virtual-jabog32/fpt.git"
 
 set :assets_manifests, ['app/assets/config/manifest.js']
 set :rails_assets_groups, :assets