Phase 2 Migration: Complete PC consolidation and fixes
## Phase 2 Migration Complete Successfully migrated all 286 active PCs from pc table to machines table. ### Migration Scripts Added/Updated: - **Phase 1.0**: Added ensure_all_machinetypes.sql (machinetypes 15-20) - **Phase 1.5**: Added migrate_equipment_ips_to_communications.sql - **Phase 2**: Updated 01_migrate_pcs_to_machines.sql for duplicate handling - **Phase 2**: Updated 08_update_schema_for_api.sql (rename pcid→machineid) - **Phase 2 Fixes**: Added FIX_migrate_remaining_pcs.sql (60 unmigrated PCs) - **Phase 2 Fixes**: Added FIX_pc_machine_types.sql ### Network Devices View Updated: - **CREATE_vw_network_devices_with_fqdn.sql**: Complete rewrite for Phase 2 - Infrastructure devices (IDF, Server, Switch, Camera, Access Point) query machines table - Printers remain in separate printers table (has fqdn column) - UNION approach: machines (machinetypeid 15-19) + printers table ### Documentation Added: - DATA_MIGRATION_EXPLAINED.md - Full migration architecture - PRODUCTION_MIGRATION_PLAN.md - Production deployment plan - VIEWS_MIGRATION_ANALYSIS.md - Views requiring updates - PRINTER_INSTALLER_FIX_2025-11-20.md - Printer installer fixes - SCHEMA_COMPARISON_REPORT_2025-11-20.md - Phase 2 schema comparison ### ASP Files Updated: - api_printers.asp - Printer API fixes - displaynotifications.asp - UI improvements - install_printer.asp - Installer fixes - v2/api_printers.asp - V2 API updates - v2/install_printer.asp - V2 installer updates ### Migration Results (DEV): - Total machines: 523 (237 equipment + 286 PCs) - Communications: 1,309 - Warranties: 212 - Machine relationships: 201 - PC migration: 286/286 ✓ - Duplicate PCs removed: 166 duplicates cleaned ### Key Achievements: ✓ All 286 active PCs migrated to machines table ✓ Network devices view updated for Phase 2 architecture ✓ pc_to_machine_id_mapping table populated (286 entries) ✓ Duplicate PC records cleaned (452→286) ✓ Schema updates for API compatibility (pcid→machineid) ### Next Steps: - Update PHP Dashboard API for Phase 2 schema (CRITICAL - see POWERSHELL_API_PHASE2_ISSUES.md) - Update PowerShell scripts for Phase 2 schema - Test Update-PC-CompleteAsset-Silent.bat - Production deployment planning 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -32,11 +32,30 @@
|
||||
<div class="col-xl-auto">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<%
|
||||
Dim showAll
|
||||
showAll = Request.QueryString("showall")
|
||||
If showAll = "" Then showAll = "0"
|
||||
%>
|
||||
<div style="display:flex; justify-content:space-between; align-items:center; margin-bottom:15px;">
|
||||
<h5 class="card-title" style="margin:0;">
|
||||
<i class="zmdi zmdi-notifications"></i> Notifications
|
||||
<% If showAll = "1" Then %>
|
||||
<span class="badge badge-info">Showing All</span>
|
||||
<% Else %>
|
||||
<span class="badge badge-success">Showing Active</span>
|
||||
<% End If %>
|
||||
</h5>
|
||||
<div>
|
||||
<% If showAll = "1" Then %>
|
||||
<a href="./displaynotifications.asp" class="btn btn-success">
|
||||
<i class="zmdi zmdi-eye"></i> Show Active Only
|
||||
</a>
|
||||
<% Else %>
|
||||
<a href="./displaynotifications.asp?showall=1" class="btn btn-info">
|
||||
<i class="zmdi zmdi-time-restore"></i> Show All History
|
||||
</a>
|
||||
<% End If %>
|
||||
<a href="./calendar.asp" class="btn btn-secondary">
|
||||
<i class="zmdi zmdi-calendar"></i> Calendar View
|
||||
</a>
|
||||
@@ -73,11 +92,17 @@
|
||||
"END as is_complete " & _
|
||||
"FROM notifications n " & _
|
||||
"LEFT JOIN notificationtypes nt ON n.notificationtypeid = nt.notificationtypeid " & _
|
||||
"LEFT JOIN businessunits bu ON n.businessunitid = bu.businessunitid " & _
|
||||
"WHERE n.isactive = 1 OR " & _
|
||||
" (n.isactive = 0 AND n.endtime IS NOT NULL AND " & _
|
||||
" DATE_ADD(n.endtime, INTERVAL 30 MINUTE) >= NOW()) " & _
|
||||
"ORDER BY n.notificationid DESC"
|
||||
"LEFT JOIN businessunits bu ON n.businessunitid = bu.businessunitid "
|
||||
|
||||
' Add WHERE clause based on showall parameter
|
||||
If showAll <> "1" Then
|
||||
strSQL = strSQL & _
|
||||
"WHERE n.isactive = 1 OR " & _
|
||||
" (n.isactive = 0 AND n.endtime IS NOT NULL AND " & _
|
||||
" DATE_ADD(n.endtime, INTERVAL 30 MINUTE) >= NOW()) "
|
||||
End If
|
||||
|
||||
strSQL = strSQL & "ORDER BY n.notificationid DESC"
|
||||
Set rs = objconn.Execute(strSQL)
|
||||
|
||||
If rs.EOF Then
|
||||
|
||||
Reference in New Issue
Block a user