теперь логику на rust

Cargo.toml

@@ -0,0 +1,14 @@
+```toml
+[package]
+name = "welders-api"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+actix-web = "4.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tokio = { version = "1.0", features = ["full"] }
+```
+
+Now let's update the frontend to use this API:

plan.html

@@ -28,47 +28,16 @@
             </div>
         </div>
     </div>
-
     <!-- Plan List -->
-    <div class="p-4 space-y-4 mb-24">
-        <!-- Plan Item (Completed) -->
-        <div class="bg-white rounded-lg shadow overflow-hidden completed-plan">
-            <div class="p-4">
-                <div class="flex items-center">
-                    <div class="flex-1">
-                        <div class="font-medium">HT637</div>
-                    </div>
-                    <div class="text-green-500 font-medium">6/6</div>
-                </div>
-                <div class="mt-2 text-sm text-gray-500">
-                    <div>Johnson: 2, Smith: 2, Williams: 2</div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Plan Item (In Progress) -->
-        <div class="bg-white rounded-lg shadow overflow-hidden">
-            <div class="p-4">
-                <div class="flex items-center">
-                    <div class="flex-1">
-                        <div class="font-medium">HT52</div>
-                    </div>
-                    <div class="text-gray-500">3/∞</div>
-                </div>
-                <div class="mt-2 text-sm text-gray-500">
-                    <div>Johnson: 1, Williams: 2</div>
-                </div>
-            </div>
-        </div>
-    </div>
+    <div id="plan-list" class="p-4 space-y-4 mb-24"></div>
 
     <!-- Fixed Bottom Panel -->
     <div class="fixed bottom-0 left-0 right-0 bg-white shadow-md z-10 p-4">
         <div class="font-medium mb-2 text-gray-700">Norms</div>
         <div class="flex">
-            <input type="text" placeholder="Article" class="flex-1 p-2 border rounded-l">
-            <input type="text" placeholder="Time norm" class="w-24 p-2 border-t border-b">
-            <button class="bg-gray-600 text-white px-4 rounded-r flex items-center">
+            <input id="norm-article" type="text" placeholder="Article" class="flex-1 p-2 border rounded-l">
+            <input id="norm-time" type="number" placeholder="Time norm" step="0.1" class="w-24 p-2 border-t border-b">
+            <button id="add-norm" class="bg-gray-600 text-white px-4 rounded-r flex items-center">
                 <i data-feather="plus" class="mr-2"></i>Add
             </button>
         </div>
@@ -76,6 +45,85 @@
 
     <script>
         feather.replace();
+
+        // Load plans and norms
+        async function loadData() {
+            try {
+                // Load plans
+                const plansResponse = await fetch('http://localhost:8080/plans');
+                const plans = await plansResponse.json();
+                
+                const planList = document.getElementById('plan-list');
+                planList.innerHTML = '';
+                
+                plans.forEach(plan => {
+                    const assignments = Object.entries(plan.assignments)
+                        .map(([welderId, qty]) => `${welderId}: ${qty}`)
+                        .join(', ');
+                    
+                    const planItem = document.createElement('div');
+                    planItem.className = plan.completed_quantity === plan.total_quantity 
+                        ? 'bg-white rounded-lg shadow overflow-hidden completed-plan'
+                        : 'bg-white rounded-lg shadow overflow-hidden';
+                    
+                    planItem.innerHTML = `
+                        <div class="p-4">
+                            <div class="flex items-center">
+                                <div class="flex-1">
+                                    <div class="font-medium">${plan.article_code}</div>
+                                </div>
+                                <div class="${plan.completed_quantity === plan.total_quantity ? 'text-green-500' : 'text-gray-500'} font-medium">
+                                    ${plan.completed_quantity}/${plan.total_quantity}
+                                </div>
+                            </div>
+                            <div class="mt-2 text-sm text-gray-500">
+                                <div>${assignments}</div>
+                            </div>
+                        </div>
+                    `;
+                    planList.appendChild(planItem);
+                });
+
+                // Load norms (could be used for display if needed)
+                const normsResponse = await fetch('http://localhost:8080/norms');
+                const norms = await normsResponse.json();
+                console.log('Loaded norms:', norms);
+            } catch (error) {
+                console.error('Error loading data:', error);
+            }
+        }
+
+        // Add new norm
+        document.getElementById('add-norm').addEventListener('click', async () => {
+            const article = document.getElementById('norm-article').value.trim();
+            const timeNorm = parseFloat(document.getElementById('norm-time').value);
+            
+            if (article && !isNaN(timeNorm) && timeNorm > 0) {
+                try {
+                    const response = await fetch('http://localhost:8080/norms', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                        body: JSON.stringify({
+                            article_code: article,
+                            time_norm: timeNorm
+                        }),
+                    });
+                    
+                    if (response.ok) {
+                        document.getElementById('norm-article').value = '';
+                        document.getElementById('norm-time').value = '';
+                        console.log('Norm added successfully');
+                    }
+                } catch (error) {
+                    console.error('Error adding norm:', error);
+                }
+            }
+        });
+
+        // Load initial data
+        loadData();
     </script>
 </body>
 </html>

server.rs

@@ -0,0 +1,145 @@
+```rust
+use actix_web::{web, App, HttpServer, HttpResponse, Responder};
+use serde::{Deserialize, Serialize};
+use std::sync::Mutex;
+use std::collections::HashMap;
+
+// Data models
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct Welder {
+    id: u32,
+    name: String,
+    articles: Vec<Article>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct Article {
+    id: u32,
+    code: String,
+    quantity: u32,
+    completed: u32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct Plan {
+    id: u32,
+    article_code: String,
+    total_quantity: u32,
+    completed_quantity: u32,
+    assignments: HashMap<u32, u32>, // welder_id -> quantity
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct Norm {
+    article_code: String,
+    time_norm: f32, // hours per unit
+}
+
+// App state
+struct AppState {
+    welders: Mutex<Vec<Welder>>,
+    plans: Mutex<Vec<Plan>>,
+    norms: Mutex<Vec<Norm>>,
+    next_welder_id: Mutex<u32>,
+    next_article_id: Mutex<u32>,
+    next_plan_id: Mutex<u32>,
+}
+
+// REST API handlers
+async fn get_welders(data: web::Data<AppState>) -> impl Responder {
+    let welders = data.welders.lock().unwrap();
+    HttpResponse::Ok().json(welders.clone())
+}
+
+async fn add_welder(data: web::Data<AppState>, welder: web::Json<Welder>) -> impl Responder {
+    let mut welders = data.welders.lock().unwrap();
+    let mut next_id = data.next_welder_id.lock().unwrap();
+    let new_welder = Welder {
+        id: *next_id,
+        name: welder.name.clone(),
+        articles: vec![],
+    };
+    *next_id += 1;
+    welders.push(new_welder.clone());
+    HttpResponse::Created().json(new_welder)
+}
+
+async fn get_plans(data: web::Data<AppState>) -> impl Responder {
+    let plans = data.plans.lock().unwrap();
+    HttpResponse::Ok().json(plans.clone())
+}
+
+async fn add_plan(data: web::Data<AppState>, plan: web::Json<Plan>) -> impl Responder {
+    let mut plans = data.plans.lock().unwrap();
+    let mut next_id = data.next_plan_id.lock().unwrap();
+    let mut new_plan = plan.into_inner();
+    new_plan.id = *next_id;
+    *next_id += 1;
+    plans.push(new_plan.clone());
+    HttpResponse::Created().json(new_plan)
+}
+
+async fn get_norms(data: web::Data<AppState>) -> impl Responder {
+    let norms = data.norms.lock().unwrap();
+    HttpResponse::Ok().json(norms.clone())
+}
+
+async fn add_norm(data: web::Data<AppState>, norm: web::Json<Norm>) -> impl Responder {
+    let mut norms = data.norms.lock().unwrap();
+    norms.push(norm.into_inner());
+    HttpResponse::Created().json(norms.last().unwrap().clone())
+}
+
+async fn assign_article(
+    data: web::Data<AppState>,
+    path: web::Path<(u32,)>,
+    article: web::Json<Article>,
+) -> impl Responder {
+    let (welder_id,) = path.into_inner();
+    let mut welders = data.welders.lock().unwrap();
+    let mut next_article_id = data.next_article_id.lock().unwrap();
+
+    if let Some(welder) = welders.iter_mut().find(|w| w.id == welder_id) {
+        let new_article = Article {
+            id: *next_article_id,
+            code: article.code.clone(),
+            quantity: article.quantity,
+            completed: 0,
+        };
+        *next_article_id += 1;
+        welder.articles.push(new_article.clone());
+        HttpResponse::Created().json(new_article)
+    } else {
+        HttpResponse::NotFound().json("Welder not found")
+    }
+}
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    // Initialize app state
+    let app_state = web::Data::new(AppState {
+        welders: Mutex::new(vec![]),
+        plans: Mutex::new(vec![]),
+        norms: Mutex::new(vec![]),
+        next_welder_id: Mutex::new(1),
+        next_article_id: Mutex::new(1),
+        next_plan_id: Mutex::new(1),
+    });
+
+    // Start HTTP server
+    HttpServer::new(move || {
+        App::new()
+            .app_data(app_state.clone())
+            .route("/welders", web::get().to(get_welders))
+            .route("/welders", web::post().to(add_welder))
+            .route("/welders/{id}/articles", web::post().to(assign_article))
+            .route("/plans", web::get().to(get_plans))
+            .route("/plans", web::post().to(add_plan))
+            .route("/norms", web::get().to(get_norms))
+            .route("/norms", web::post().to(add_norm))
+    })
+    .bind("127.0.0.1:8080")?
+    .run()
+    .await
+}
+```

welder-card.html

@@ -31,33 +31,83 @@
             </button>
         </div>
     </div>
-
     <!-- Articles List -->
-    <div class="p-4 space-y-4 mb-20">
-        <!-- Month Divider -->
-        <div class="bg-gray-200 px-4 py-2 rounded font-medium">August 2023</div>
-        
-        <!-- Article Items -->
-        <div class="bg-white rounded-lg shadow overflow-hidden">
-            <div class="p-4 border-b flex items-center">
-                <div class="flex-1">
-                    <div class="font-medium">HT637</div>
-                    <div class="text-sm text-gray-500">4 pieces</div>
-                </div>
-                <div class="text-green-500 font-medium">4/6</div>
-            </div>
-            <div class="p-4 flex items-center">
-                <div class="flex-1">
-                    <div class="font-medium">HT52</div>
-                    <div class="text-sm text-gray-500">3 pieces</div>
-                </div>
-                <div class="text-gray-500">3/∞</div>
-            </div>
-        </div>
-    </div>
+    <div id="articles-list" class="p-4 space-y-4 mb-20"></div>
 
     <script>
         feather.replace();
+
+        // Get welder ID from URL
+        const urlParams = new URLSearchParams(window.location.search);
+        const welderId = urlParams.get('id');
+
+        // Load welder's articles
+        async function loadArticles() {
+            try {
+                const response = await fetch(`http://localhost:8080/welders/${welderId}/articles`);
+                const articles = await response.json();
+                
+                const articlesList = document.getElementById('articles-list');
+                articlesList.innerHTML = '';
+                
+                // Group articles by month (simplified example)
+                const monthDivider = document.createElement('div');
+                monthDivider.className = 'bg-gray-200 px-4 py-2 rounded font-medium';
+                monthDivider.textContent = new Date().toLocaleString('default', { month: 'long', year: 'numeric' });
+                articlesList.appendChild(monthDivider);
+                
+                articles.forEach(article => {
+                    const articleItem = document.createElement('div');
+                    articleItem.className = 'bg-white rounded-lg shadow overflow-hidden';
+                    articleItem.innerHTML = `
+                        <div class="p-4 border-b flex items-center">
+                            <div class="flex-1">
+                                <div class="font-medium">${article.code}</div>
+                                <div class="text-sm text-gray-500">${article.quantity} pieces</div>
+                            </div>
+                            <div class="${article.completed === article.quantity ? 'text-green-500' : 'text-gray-500'} font-medium">
+                                ${article.completed}/${article.quantity}
+                            </div>
+                        </div>
+                    `;
+                    articlesList.appendChild(articleItem);
+                });
+            } catch (error) {
+                console.error('Error loading articles:', error);
+            }
+        }
+
+        // Add new article
+        document.querySelector('button.bg-blue-500').addEventListener('click', async () => {
+            const codeInput = document.querySelector('input[placeholder="Article"]');
+            const qtyInput = document.querySelector('input[placeholder="Qty"]');
+            
+            const code = codeInput.value.trim();
+            const quantity = parseInt(qtyInput.value);
+            
+            if (code && quantity > 0) {
+                try {
+                    const response = await fetch(`http://localhost:8080/welders/${welderId}/articles`, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                        body: JSON.stringify({ code, quantity }),
+                    });
+                    
+                    if (response.ok) {
+                        codeInput.value = '';
+                        qtyInput.value = '';
+                        await loadArticles();
+                    }
+                } catch (error) {
+                    console.error('Error adding article:', error);
+                }
+            }
+        });
+
+        // Load initial data
+        loadArticles();
     </script>
 </body>
 </html>

welders.html

@@ -92,33 +92,63 @@
     <script>
         // Initialize feather icons
         feather.replace();
+        // Fetch welders from API
+        async function loadWelders() {
+            try {
+                const response = await fetch('http://localhost:8080/welders');
+                const welders = await response.json();
+                
+                const weldersList = document.getElementById('welders-list');
+                welders.forEach(welder => {
+                    const welderItem = document.createElement('div');
+                    welderItem.className = 'panel p-4 rounded-lg cursor-pointer transition hover:bg-gray-50';
+                    welderItem.innerHTML = `
+                        <div class="flex items-center">
+                            <i data-feather="user" class="text-gray-500 mr-3"></i>
+                            <span class="font-medium">${welder.name}</span>
+                            <i data-feather="chevron-right" class="ml-auto text-gray-400"></i>
+                        </div>
+                    `;
+                    welderItem.addEventListener('click', () => {
+                        window.location.href = `welder-card.html?id=${welder.id}`;
+                    });
+                    weldersList.appendChild(welderItem);
+                });
+                feather.replace();
+            } catch (error) {
+                console.error('Error loading welders:', error);
+            }
+        }
 
-        // Sample data for demonstration
-        const welders = [
-            { id: 1, name: "Smith" },
-            { id: 2, name: "Johnson" },
-            { id: 3, name: "Williams" }
-        ];
-
-        // Render welder's list
-        const weldersList = document.getElementById('welders-list');
-        welders.forEach(welder => {
-            const welderItem = document.createElement('div');
-            welderItem.className = 'panel p-4 rounded-lg cursor-pointer transition hover:bg-gray-50';
-            welderItem.innerHTML = `
-                <div class="flex items-center">
-                    <i data-feather="user" class="text-gray-500 mr-3"></i>
-                    <span class="font-medium">${welder.name}</span>
-                    <i data-feather="chevron-right" class="ml-auto text-gray-400"></i>
-                </div>
-            `;
-            welderItem.addEventListener('click', () => {
-                window.location.href = `welder-card.html?id=${welder.id}`;
-            });
-            weldersList.appendChild(welderItem);
+        // Add new welder
+        document.querySelector('button.btn-primary').addEventListener('click', async () => {
+            const input = document.querySelector('input');
+            const name = input.value.trim();
+            
+            if (name) {
+                try {
+                    const response = await fetch('http://localhost:8080/welders', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                        body: JSON.stringify({ name }),
+                    });
+                    
+                    if (response.ok) {
+                        input.value = '';
+                        document.getElementById('welders-list').innerHTML = '';
+                        await loadWelders();
+                    }
+                } catch (error) {
+                    console.error('Error adding welder:', error);
+                }
+            }
         });
 
-        // Plan button click handler
+        // Load initial data
+        loadWelders();
+// Plan button click handler
         document.getElementById('plan-btn').addEventListener('click', () => {
             window.location.href = 'plan.html';
         });