]> OzVa Git service - shopping-channel/commitdiff
Added display screen to make more space on the autoc
authorMax Value <greenwoodw50@gmail.com>
Sat, 12 Apr 2025 13:06:35 +0000 (14:06 +0100)
committerMax Value <greenwoodw50@gmail.com>
Sat, 12 Apr 2025 13:06:35 +0000 (14:06 +0100)
- Removed timers 4-6

info.json [deleted file]
static/info.json
teleshopping.py
templates/autocue.html
templates/call-sheet.tex
templates/gfx.html
templates/timer.html

diff --git a/info.json b/info.json
deleted file mode 100644 (file)
index 87d3729..0000000
--- a/info.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-       "shoot": {
-               "date": "10th April 2025",
-               "location": "MediaCity UoS, Room 3.08"
-       },
-       "crew":[
-               {
-                       "name": "William Greenwood (T)",
-                       "role": "Producer",
-                       "phone": "075 9476 8180",
-                       "email": "W.Greenwood@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Finn Downton (T)",
-                       "role": "Narrative enginneer",
-                       "phone": "079 1003 1116",
-                       "email": "E.Downton@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Jack Christian-Sims (T)",
-                       "role": "Director",
-                       "phone": "075 4297 4087",
-                       "email": "J.Christian-Sims@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Eleanor Haughton",
-                       "role": "Vision Mixer",
-                       "phone": "074 9127 2723",
-                       "email": "E.V.Haughton@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Heather Digwood (T)",
-                       "role": "Floor manager",
-                       "phone": "077 8817 3853",
-                       "email": "H.Digwood@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Olivia Gillett (T)",
-                       "role": "Floor manager",
-                       "phone": "073 6852 4302",
-                       "email": "O.Gillett@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Leo Garside-Holdich",
-                       "role": "Camera opperator",
-                       "phone": "078 7474 0891",
-                       "email": "L.N.Garside-Holdich@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Rebecca Dixon",
-                       "role": "Sound opperator",
-                       "phone": "074 3400 7701",
-                       "email": "R.Dixon2@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Alex Roberts",
-                       "role": "Lighting opperator",
-                       "phone": "074 9660 1832",
-                       "email": "A.Roberts17@edu.salford.ac.uk",
-                       "absent": true
-               },
-               {
-                       "name": "Tegan Blake-Barnard (T)",
-                       "role": "Set-design lead",
-                       "phone": "075 4893 0872",
-                       "email": "T.blake-barnard@edu.Salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Lydia Wilkinson",
-                       "role": "Set-design / GFX opperator",
-                       "phone": "078 0269 0037",
-                       "email": "L.wilkinson14@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Leigha Blanchard",
-                       "role": "Set-design / GFX opperator",
-                       "phone": "074 7700 0501",
-                       "email": "L.blanchard@salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Daisy Devoe",
-                       "role": "Set-design / GFX opperator",
-                       "phone": "079 7056 4500",
-                       "email": "D.Devoe@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Brynn Yates",
-                       "role": "GFX opperator",
-                       "phone": "073 7766 9812",
-                       "email": "M.Yates5@edu.salford.ac.uk",
-                       "absent": false
-               },
-               {
-                       "name": "Shan Hackwood",
-                       "role": "Engineer",
-                       "phone": "075 3068 9322",
-                       "email": "S.Hackwood@edu.salford.ac.uk",
-                       "absent": false
-               }
-       ],
-       "cast":[
-               {
-                       "name": "David Smith",
-                       "role": "Anchor",
-                       "phone": "078 8839 8003",
-                       "email": "D.Smith51@edu.salford.ac.uk",
-                       "absent": false
-               }
-       ],
-       "schedule":[
-               {
-                       "time": "1045",
-                       "title": "Kit is picked up by producer and directors arrive for briefing",
-                       "extra": ["Meet at kit store (1st floor)"]
-               },
-               {
-                       "time": "1115",
-                       "title": "Crew call time",
-                       "extra": [
-                               "Meet in room 3.08 MediacityUK campus",
-                               "Setup to be completed for 1200",
-                               "Set-design team to prepare stand-in products"
-                               ]
-               },
-               {
-                       "time": "1200",
-                       "title": "Break until 1215",
-                       "extra": ["Crew call time (Room 3.08) for meeting with directors"]
-               },
-               {
-                       "time": "1215",
-                       "title": "Crew arrives back to studio",
-                       "extra": [
-                               "Final full overview of responsibilities",
-                               "Moving onto smaller run-throughs and trying new techniques"
-                               ]
-               },
-               {
-                       "time": "1315",
-                       "title": "All-hands break till 1330",
-                       "extra": []
-               },
-               {
-                       "time": "1330",
-                       "title": "Prep for, and record, 25 minute continuous run",
-                       "extra": ["30 minutes contingency"]
-               },
-               {
-                       "time": "1430",
-                       "title": "De-brief and pass on notes to producer",
-                       "extra": []
-               },
-               {
-                       "time": "1500",
-                       "title": "De-rig",
-                       "extra": ["All crew (other than directors and Anchor) dismissed as soon as finished."]
-               },
-               {
-                       "time": "1530",
-                       "title": "Kit returned to store",
-                       "extra": [
-                               "Anchor dismissed.",
-                               "Producer and Directors meeting till dismissed"
-                               ]
-               }
-       ],
-       "notes": [
-               "Note that this is a practice session, nothing forbidden is practiced or revealed.",
-               "Small test runs of small GFX features (e.g. Multiple simultaneous timers)",
-               "Run through at least 25 minutes of continuous teleshopping (Recorded).",
-               "Particularly looking for feedback on: new sound system, new feature text, new sigil visuals, new GFX control layout",
-               "Additional notes on further features ahead of the next practice session."
-               ]
-}
index 0af08fdae3322290572529e233359f2eaa37a854..80e492f1072da96333f3874128e2b9d6549805a4 100644 (file)
                {
                        "name": "Finn Downton (T)",
                        "role": "Narrative enginneer",
-                       "phone": "079 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "079 1003 1116",
+                       "email": "E.Downton@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Jack Christian-Sims (T)",
                        "role": "Director",
-                       "phone": "075 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
-                       "absent": false
+                       "phone": "075 4297 4087",
+                       "email": "J.Christian-Sims@edu.salford.ac.uk",
+                       "absent": true
                },
                {
                        "name": "Eleanor Haughton",
                        "role": "Vision Mixer",
-                       "phone": "074 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "074 9127 2723",
+                       "email": "E.V.Haughton@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Heather Digwood (T)",
                        "role": "Floor manager",
-                       "phone": "077 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "077 8817 3853",
+                       "email": "H.Digwood@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Olivia Gillett (T)",
                        "role": "Floor manager",
-                       "phone": "073 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "073 6852 4302",
+                       "email": "O.Gillett@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Leo Garside-Holdich",
                        "role": "Camera opperator",
-                       "phone": "078 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "078 7474 0891",
+                       "email": "L.N.Garside-Holdich@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Rebecca Dixon",
                        "role": "Sound opperator",
-                       "phone": "074 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "074 3400 7701",
+                       "email": "R.Dixon2@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Alex Roberts",
                        "role": "Lighting opperator",
-                       "phone": "074 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "074 9660 1832",
+                       "email": "A.Roberts17@edu.salford.ac.uk",
                        "absent": true
                },
                {
                        "name": "Tegan Blake-Barnard (T)",
                        "role": "Set-design lead",
-                       "phone": "075 **** ****",
-                       "email": "*****@edu.Salford.ac.uk",
+                       "phone": "075 4893 0872",
+                       "email": "T.blake-barnard@edu.Salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Lydia Wilkinson",
                        "role": "Set-design / GFX opperator",
-                       "phone": "078 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
-                       "absent": false
+                       "phone": "078 0269 0037",
+                       "email": "L.wilkinson14@edu.salford.ac.uk",
+                       "absent": true
                },
                {
                        "name": "Leigha Blanchard",
                        "role": "Set-design / GFX opperator",
-                       "phone": "074 **** ****",
-                       "email": "*****@salford.ac.uk",
-                       "absent": false
+                       "phone": "074 7700 0501",
+                       "email": "L.blanchard@salford.ac.uk",
+                       "absent": true
                },
                {
                        "name": "Daisy Devoe",
                        "role": "Set-design / GFX opperator",
-                       "phone": "079 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "079 7056 4500",
+                       "email": "D.Devoe@edu.salford.ac.uk",
                        "absent": false
                },
                {
                        "name": "Brynn Yates",
                        "role": "GFX opperator",
-                       "phone": "073 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
-                       "absent": false
+                       "phone": "073 7766 9812",
+                       "email": "M.Yates5@edu.salford.ac.uk",
+                       "absent": true
                },
                {
                        "name": "Shan Hackwood",
                        "role": "Engineer",
-                       "phone": "075 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
-                       "absent": false
+                       "phone": "075 3068 9322",
+                       "email": "S.Hackwood@edu.salford.ac.uk",
+                       "absent": true
                }
        ],
        "cast":[
                {
                        "name": "David Smith",
                        "role": "Anchor",
-                       "phone": "078 **** ****",
-                       "email": "*****@edu.salford.ac.uk",
+                       "phone": "078 8839 8003",
+                       "email": "D.Smith51@edu.salford.ac.uk",
                        "absent": false
                }
        ],
        "schedule":[
                {
                        "time": "1045",
-                       "title": "Kit is picked up by producer and directors arrive for briefing",
-                       "extra": ["Meet at kit store (1st floor)"]
+                       "title": "Kit is picked up by producer",
+                       "extra": ["Kit store (1st floor)"]
                },
                {
-                       "time": "1115",
-                       "title": "Crew call time",
+                       "time": "1130",
+                       "title": "Set-design call time",
                        "extra": [
                                "Meet in room 3.08 MediacityUK campus",
                                "Setup to be completed for 1200",
                },
                {
                        "time": "1200",
-                       "title": "Break until 1215",
-                       "extra": ["Crew call time (Room 3.08) for meeting with directors"]
+                       "title": "Crew call time (Room 3.08) for meeting with producer",
+                       "extra": []
                },
                {
-                       "time": "1215",
-                       "title": "Crew arrives back to studio",
-                       "extra": [
-                               "Final full overview of responsibilities",
-                               "Moving onto smaller run-throughs and trying new techniques"
-                               ]
+                       "time": "1245",
+                       "title": "Crew break until 1315",
+                       "extra": []
                },
                {
-                       "time": "1315",
-                       "title": "All-hands break till 1330",
+                       "time": "1300",
+                       "title": "Cast call time to room 3.08 for briefing.",
                        "extra": []
                },
                {
-                       "time": "1330",
-                       "title": "Prep for, and record, 25 minute continuous run",
-                       "extra": ["30 minutes contingency"]
+                       "time": "1315",
+                       "title": "Practice begins",
+                       "extra": [
+                               "Final full overview of responsibilities",
+                               "Moving onto smaller run-throughs and trying new techniques"
+                               ]
                },
                {
-                       "time": "1430",
-                       "title": "De-brief and pass on notes to producer",
-                       "extra": []
+                       "time": "1400",
+                       "title": "Cast 15 minute break",
+                       "extra": [
+                               "Some crew may also be dissmissed for a break",
+                               "Producer chat before run-through"
+                               ]
                },
                {
-                       "time": "1500",
-                       "title": "De-rig",
+                       "time": "1430",
+                       "title": "Begin run-through",
                        "extra": ["All crew (other than directors and Anchor) dismissed as soon as finished."]
                },
                {
index 4944a27a1b1b04e2c1753928cc4515854bbb5df1..84da8f7bed305b51008639d3c244ca87503bc827 100755 (executable)
@@ -67,7 +67,13 @@ def gfx_main():
 
 @app.route("/autocue")
 def gfx_page():
-       return Response(render_template("autocue.html"), mimetype="text/html")
+       request.method = "internal"
+       data = api()
+       return Response(render_template("autocue.html", data=data, item=static_data["items"][data["item_id"]]), mimetype="text/html")
+
+@app.route("/display")
+def display_page():
+       return Response(render_template("display.html"), mimetype="text/html")
 
 @app.route("/sounds")
 def sounds_page():
index 4c94ad99eb06f30cb1d930478d37cf16b3d08edc..e16330b6019aa57e8e63f947ef6353750242c51d 100644 (file)
@@ -22,17 +22,6 @@ body {
        bottom: 0;
        left: 0;
        margin: 20px;
-}
-#clock {
-       position: absolute;
-       bottom: 0;
-       right: 0;
-       width: 250px;
-       height: 250px;
-       margin: 10px;
-}
-#arrow {
-       transition: transform 1.5s;
 }
                </style>
                <script>
@@ -57,7 +46,7 @@ function makeTime(end, offset, strike) {
 // dynamically resize the UI
 function resize() {
        var slider = document.getElementById("slider");
-       for (let id of ["note", "producer", "timer"]) {
+       for (let id of ["note", "producer"]) {
                document.getElementById(id).style.fontSize = `${slider.value}px`;
        }
 }
@@ -81,24 +70,6 @@ function update () {
                                                // update the item information
                                                const note = document.getElementById("note");
                                                note.innerHTML = items[id].notes;
-
-                                               // update the clock
-                                               document.getElementById("arrow").style.transform = `rotate(${data.current_position}deg)`;
-
-                                               // update the total items and the items sold already
-                                               document.getElementById("left").innerHTML = Math.round(
-                                                       items[id].stock_count * (data.percent_remaining / 100)
-                                                       );
-                                               document.getElementById("stock").innerHTML = items[id].stock_count;
-
-                                               // update the timers
-                                               for (let t = 1; t <= 6; t++) {
-                                                       document.getElementById(`timer_${t}`).innerHTML = makeTime(
-                                                               data[`end_timer_${t}`],
-                                                               data['timer_offset'],
-                                                               data[`bool_timer_${t}`]
-                                                               )
-                                               }
                                        })
                                });
 }
@@ -110,19 +81,7 @@ setInterval(update, 1000);
        </head>
        <body onload="resize(); update();">
                <input type="range" min="30" max="100" value="45" id="slider">
-               <div style="font-size: 50px;" id="note">some test text!</div>
-               <div style="font-size: 50px; color: yellow;" id="producer">Producer Notes!</div>
-               <div id="timer">
-                       T1: <span style="background-color: red;" id="timer_1"></span> -
-                       T2: <span style="background-color: green;" id="timer_2"></span> -
-                       T3: <span style="background-color: blue;" id="timer_3"></span><br>
-                       T4: <span style="background-color: yellow;" id="timer_4"></span> -
-                       T5: <span style="background-color: magenta;" id="timer_5"></span> -
-                       T6: <span style="background-color: orange; margin-right: 40px;" id="timer_6"></span>
-                       Left: <span id="left"></span>/<span id="stock"></span>
-               </div>
-               <div id="clock">
-                       <img style="width: 100%; margin-right: -100%;" src="./static/assets/clock.svg"><img id="arrow" style="width: 100%;" src="./static/assets/arrow.svg">
-               </div>
+               <div style="font-size: 50px;" id="note">{{item.notes|safe}}</div>
+               <div style="font-size: 50px; color: yellow;" id="producer">{{data.note}}</div>
        </body>
 </html>
index aab6b44c95e0b89f53b708616f87e96b827316b4..8340c18cc2bbe422837a837366236c192eb48f93 100644 (file)
@@ -30,8 +30,10 @@ Location: |~ info.shoot.location ~|
     \hline
 \textbf{Crew} &&&\\
     |% for person in info.crew %|
-        \hline
-        |~ person.name ~| & |~ person.role ~| & |~ person.phone ~| & |~ person.email ~| \\
+        |% if not person.absent %|
+            \hline
+            |~ person.name ~| & |~ person.role ~| & |~ person.phone ~| & |~ person.email ~| \\
+        |% endif %|
     |% endfor %|
     \hline
     \hline
index dd86eeb8789edf01d9a47d75d19a62d0e4121805..2ad39d5cc16f7e7bc1cdd083af191800d37dad2e 100644 (file)
@@ -756,7 +756,7 @@ function update() {
             else {all.classList.remove("show");}
 
             // set all timers to correct time and show/focus
-            for (let t = 1; t <= 6; t++) {
+            for (let t = 1; t <= 3; t++) {
                 const timer = timers[t-1];
 
                 if (timer != null) {
index a91a98bf7b91f04fc0d74f30b26e5ad3b80ba6a9..7fe045eb7db10bfb9d255b6911a48a3b595a31e3 100644 (file)
@@ -10,7 +10,7 @@
                        <fieldset>
                                <legend>Timers</legend>
                                <p style='color: red;'>Note: time is approximate and may not be accurate to the GFX display.</p>
-                               {% for t in (1,2,3,4,5,6) %}
+                               {% for t in (1,2,3) %}
                                        <label>Timer {{t}}</label> <label style='color: blue;' id='{{t}}'>00:00</label>
                                        <input type='radio' value='0' name='end_timer_{{t}}'><label>Reset</label>
                                        <input type='radio' value='30' name='end_timer_{{t}}'><label>+00:30</label>